diff --git a/OpenWrt/n2n_for_openwrt_routers.bash b/OpenWrt/n2n_for_openwrt_routers.bash deleted file mode 100755 index 8c85e3a..0000000 --- a/OpenWrt/n2n_for_openwrt_routers.bash +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash -# Ubuntu -#sudo apt-get install gcc-multilib g++-multilib git libncurses-dev gawk perl python3-distutils -#-sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.12 10 -# AltLinux - не удалось запустить -#sudo apt-get install perl-IPC-Cmd perl-CPAN -#cpan JSON - -# wl500gpv2 https://archive.openwrt.org/releases/22.03.0/targets/bcm47xx/legacy/openwrt-sdk-22.03.0-bcm47xx-legacy_gcc-11.2.0_musl.Linux-x86_64.tar.xz - -# wl520gu url="https://downloads.openwrt.org/releases/19.07.6/targets/brcm47xx/legacy/openwrt-sdk-19.07.6-brcm47xx-legacy_gcc-7.5.0_musl.Linux-x86_64.tar.xz" # Fix gcc version include/prereq-build.mk: grep -E '^(4\.[8-9]|[5-9]\.?|13\.?)' - -# dir 620 c1 (asus_rt-n15u) url="https://downloads.openwrt.org/releases/23.05.5/targets/bcm47xx/mips74k/openwrt-sdk-23.05.5-bcm47xx-mips74k_gcc-12.3.0_musl.Linux-x86_64.tar.xz" - -# wl520gu 17.01.7 -url="https://archive.openwrt.org/releases/17.01.7/targets/brcm47xx/legacy/lede-sdk-17.01.7-brcm47xx-legacy_gcc-5.4.0_musl-1.1.16.Linux-x86_64.tar.xz" - -file_name="${url##*/}" -base="${file_name%.[^.]*.[^.]*}" -ext="${file_name:${#base} + 1}" - -sdk_name=${base} -sdk=${file_name} - -[ -f ./${sdk} ] || wget "${url}" - -[ -d ./${sdk_name} ] || tar -xf "${sdk}" - -[ -f ./n2n ] || git clone https://github.com/ntop/n2n n2n - -N2N_PKG_VERSION=$(n2n/scripts/version.sh) -echo $N2N_PKG_VERSION - -cp -r n2n/packages/openwrt ${sdk_name}/package/n2n - -cd ${sdk_name} - -make oldconfig - -make package/n2n/clean V=s - -make package/n2n/prepare USE_SOURCE_DIR=$(realpath ../n2n) V=s - -make package/n2n/compile V=s - -find . -name "n2n*.ipk" - - - diff --git a/OpenWrt/upload_asus_wl-500gp-v2.bash b/OpenWrt/upload_asus_wl-500gp-v2.bash deleted file mode 100755 index f2aab53..0000000 --- a/OpenWrt/upload_asus_wl-500gp-v2.bash +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash - -url="https://downloads.openwrt.org/releases/22.03.7/targets/bcm47xx/legacy/openwrt-22.03.7-bcm47xx-legacy-asus_wl-500gp-v2-squashfs.trx" - -file_name="${url##*/}" - -[ -f ./${file_name} ] || wget "${url}" - -atftp --trace --option "timeout 10" --option "mode octet" --put --local-file "${file_name}" 192.168.1.1 - -# On router by: ssh root@192.168.1.1 -# opkg install block-mount kmod-usb-storage kmod-usb-ohci kmod-fs-ext4 kmod-usb2 -# opkg install mc -# opkg install hd-idle -# /etc/config/hd-idle: -# config 'hd-idle' -# option 'disk' 'sda' -# option 'enabled' '1' -# option 'idle_time_unit' 'minutes' -# option 'idle_time_interval' '10' diff --git a/OpenWrt/upload_asus_wl520gu.bash b/OpenWrt/upload_asus_wl520gu.bash deleted file mode 100755 index 4238dc1..0000000 --- a/OpenWrt/upload_asus_wl520gu.bash +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -url="http://downloads.openwrt.org/backfire/10.03/brcm47xx/openwrt-brcm47xx-squashfs.trx" - -file_name="${url##*/}" - -[ -f ./${file_name} ] || wget "${url}" - -atftp --trace --option "timeout 10" --option "mode octet" --put --local-file "${file_name}" 192.168.1.1 - diff --git a/Script/alias_main b/Script/alias_main index 46607ee..c31d799 100755 --- a/Script/alias_main +++ b/Script/alias_main @@ -1,23 +1,5 @@ #!/bin/bash -prefix='a_' - -mkalias_with_prefix() -{ - alias ${prefix}$1="$1" -} - -ask_continue() -{ - read -p "Продолжить [Y/n]?:" answ - if [[ "${answ}" == "n" || "${answ}" == "N" ]]; then - echo "Отменено" - return 0 - fi - return 1 -} - - source "${alias_dir}/install" source "${alias_dir}/pdf" source "${alias_dir}/hdd" diff --git a/Script/common b/Script/common new file mode 100644 index 0000000..1faf9da --- /dev/null +++ b/Script/common @@ -0,0 +1,18 @@ +#!/bin/bash + +prefix='a_' + +mkalias_with_prefix() +{ + alias ${prefix}$1="$1" +} + +ask_continue() +{ + read -p "Продолжить [Y/n]?:" answ + if [[ "${answ}" == "n" || "${answ}" == "N" ]]; then + echo "Отменено" + return 0 + fi + return 1 +} diff --git a/Script/download b/Script/download index 7d1168e..f2b94d6 100644 --- a/Script/download +++ b/Script/download @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + vd='~/.local/bin/yt-dlp' alias ${prefix}download_yt_dlp="${vd}" diff --git a/Script/hdd b/Script/hdd index 9759767..a233676 100644 --- a/Script/hdd +++ b/Script/hdd @@ -1,5 +1,7 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" hdd_fill_zero() { diff --git a/Script/image b/Script/image index 745d713..c126d25 100644 --- a/Script/image +++ b/Script/image @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + img_all_to_djvu() { [ ${in_files_pattern} == '' ] && printf "Объедидение файлов в djvu\nУкажите входной шаблон. Например '*.jpg'\n" && return diff --git a/Script/img_and_wav2video b/Script/img_and_wav2video index b7db0ff..30e6327 100755 --- a/Script/img_and_wav2video +++ b/Script/img_and_wav2video @@ -1,6 +1,9 @@ #!/bin/bash # Общественное достояние, 2024, Алексей Безбородов (Alexei Bezborodov) +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + img_and_wav2video() { # Объединение картинки и звука в видео diff --git a/Script/install b/Script/install index bf88985..df8f602 100644 --- a/Script/install +++ b/Script/install @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + install_alt_linux_enable_sshd() { printf "Запуск sshd\n" diff --git a/Script/lang b/Script/lang index 42dbe0c..2d88473 100644 --- a/Script/lang +++ b/Script/lang @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + lang_switch_custom() { str="$1" diff --git a/Script/nmap b/Script/nmap index c4aad31..a973505 100644 --- a/Script/nmap +++ b/Script/nmap @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + nmap_scan_hosts() { in_host_pattern=$1 diff --git a/Script/openwrt b/Script/openwrt index 148317a..ec89a69 100644 --- a/Script/openwrt +++ b/Script/openwrt @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + openwrt_make_mini_openwrt_image_prep_install() { printf "Установка компонентов для sshd openwrt_make_mini_openwrt_image\n" @@ -99,18 +102,110 @@ openwrt_make_mini_openwrt_image_22_03() } mkalias_with_prefix 'openwrt_make_mini_openwrt_image_22_03' -openwrt_n2n_for_openwrt_routers() +openwrt_upload_by_tftp() { - printf "Загрузка sshd\n" + url=$1 + file_name="${url##*/}" + + [ "$url" = "" ] && printf "Укажите url для скачивания, например 'http://downloads.openwrt.org/backfire/10.03/brcm47xx/openwrt-brcm47xx-squashfs.trx' или полный путь к файлу\n" && return + printf "Загрузка openwrt на роутер через tftp. Подойдёт например для asus_wl520gu или asus_wl500pgv2. Внимание! В текущую папру произойдёт загрузка файла ${file_name}\n" + ask_continue && return + + [ -f ./${file_name} ] || wget "${url}" + + atftp --trace --option "timeout 10" --option "mode octet" --put --local-file "${file_name}" 192.168.1.1 +} +mkalias_with_prefix 'openwrt_upload_by_tftp' + +openwrt_upload_backfire_10_03_by_tftp() +{ + url="http://downloads.openwrt.org/backfire/10.03/brcm47xx/openwrt-brcm47xx-squashfs.trx" + openwrt_upload_by_tftp ${url} +} +mkalias_with_prefix 'openwrt_upload_backfire_10_03_by_tftp' + +openwrt_upload_22_03_by_tftp() +{ + url="https://downloads.openwrt.org/releases/22.03.7/targets/bcm47xx/legacy/openwrt-22.03.7-bcm47xx-legacy-asus_wl-500gp-v2-squashfs.trx" + + openwrt_upload_by_tftp ${url} +} +mkalias_with_prefix 'openwrt_upload_22_03_by_tftp' + +openwrt_progs_install() +{ + out=' +# On router by: ssh root@192.168.1.1 +# Для внешнего ЖД +opkg install block-mount kmod-usb-storage kmod-usb-ohci kmod-fs-ext4 kmod-usb2 +opkg install mc +opkg install hd-idle +# set enabled to 1 in hd-idle config +vi /etc/config/hd-idle +' + echo "${out}" +} +mkalias_with_prefix 'openwrt_progs_install' + +openwrt_n2n_make_ipk() +{ + progs='# Ubuntu +sudo apt-get install gcc-multilib g++-multilib git libncurses-dev gawk perl python3-distutils' + #-sudo update-alternatives --install /usr/bin/python python /usr/bin/python3.12 10 + # AltLinux - не удалось запустить + #sudo apt-get install perl-IPC-Cmd perl-CPAN + #cpan JSON + + printf "Компиляция n2n для openwrt. Внимание в тукущую дирректуроию произойдёт загрузка исходников. Перед запуском рекомендуется установить программы ${progs}\n" ask_continue && return + + # wl500gpv2 https://archive.openwrt.org/releases/22.03.0/targets/bcm47xx/legacy/openwrt-sdk-22.03.0-bcm47xx-legacy_gcc-11.2.0_musl.Linux-x86_64.tar.xz + + # wl520gu url="https://downloads.openwrt.org/releases/19.07.6/targets/brcm47xx/legacy/openwrt-sdk-19.07.6-brcm47xx-legacy_gcc-7.5.0_musl.Linux-x86_64.tar.xz" # Fix gcc version include/prereq-build.mk: grep -E '^(4\.[8-9]|[5-9]\.?|13\.?)' + + # dir 620 c1 (asus_rt-n15u) url="https://downloads.openwrt.org/releases/23.05.5/targets/bcm47xx/mips74k/openwrt-sdk-23.05.5-bcm47xx-mips74k_gcc-12.3.0_musl.Linux-x86_64.tar.xz" + + # wl520gu 17.01.7 + url="https://archive.openwrt.org/releases/17.01.7/targets/brcm47xx/legacy/lede-sdk-17.01.7-brcm47xx-legacy_gcc-5.4.0_musl-1.1.16.Linux-x86_64.tar.xz" + + file_name="${url##*/}" + base="${file_name%.[^.]*.[^.]*}" + ext="${file_name:${#base} + 1}" + + sdk_name=${base} + sdk=${file_name} + + [ -f ./${sdk} ] || wget "${url}" + + [ -d ./${sdk_name} ] || tar -xf "${sdk}" + + [ -f ./n2n ] || git clone https://github.com/ntop/n2n n2n + + N2N_PKG_VERSION=$(n2n/scripts/version.sh) + echo $N2N_PKG_VERSION + + cp -r n2n/packages/openwrt ${sdk_name}/package/n2n + + cd ${sdk_name} + + make oldconfig + + make package/n2n/clean V=s + + make package/n2n/prepare USE_SOURCE_DIR=$(realpath ../n2n) V=s + + make package/n2n/compile V=s + + find . -name "n2n*.ipk" } -mkalias_with_prefix 'openwrt_' +mkalias_with_prefix 'openwrt_n2n_make_ipk' openwrt_() { - printf "Загрузка sshd\n" + printf "Загрузка\n" ask_continue && return } #mkalias_with_prefix 'openwrt_' + diff --git a/Script/parse_arg_lib b/Script/parse_arg_lib index ad32ef8..17498f7 100755 --- a/Script/parse_arg_lib +++ b/Script/parse_arg_lib @@ -1,6 +1,9 @@ #!/bin/bash # Общественное достояние, 2024, Алексей Безбородов (Alexei Bezborodov) +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + # Обработка входных параметров # Формат: diff --git a/Script/pdf b/Script/pdf index 4c43090..18462e8 100644 --- a/Script/pdf +++ b/Script/pdf @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + pdf_a5() { [ $1 == '' ] && printf "Преобразование pdf к формату А5\nОшибка! Укажите входной файл\n" && return diff --git a/Script/ssh b/Script/ssh index 2e0fd9b..73b2ab8 100644 --- a/Script/ssh +++ b/Script/ssh @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + ssh_del_known_host() { in_host_pattern=$1 diff --git a/Script/utils b/Script/utils index b745ee8..d547a91 100644 --- a/Script/utils +++ b/Script/utils @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + alias ${prefix}archive_each_file_into_separate_archive="find . -mindepth 1 -maxdepth 1 -type f -exec tar -cvzf 'out/{}.tgz' '{}' \;" unicode_U200B_correct () diff --git a/Script/video b/Script/video index 7db6f37..599ff00 100644 --- a/Script/video +++ b/Script/video @@ -1,5 +1,8 @@ #!/bin/bash +[ "${alias_dir}" = "" ] && alias_dir=$(pwd) +source "${alias_dir}/common" + video_encode_240() { [ $1 == '' ] && printf "Перекодирование видео в формат 240*180\nУкажите входной шаблон. Например '*.mp4'\n" && return