diff --git a/CheckInternetAndRestart.sh b/CheckInternetAndRestart.sh deleted file mode 100644 index b5d41ae..0000000 --- a/CheckInternetAndRestart.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/bash -host="ya.ru" - -while true; do -result=$(ping -c 3 $host | tail -2 | head -1 | awk '{print $4}') -if [ $result -eq 0 ]; then -echo "Нету интернету" -break -fi -sleep 180 -done - -exit 0 diff --git a/InstallHeaders b/InstallHeaders deleted file mode 100644 index 10d2502..0000000 --- a/InstallHeaders +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash -sudo apt-get install linux-headers-`uname -r` - diff --git a/OpenWrt/linux_mint24_install_python2.7.bash b/OpenWrt/linux_mint24_install_python2.7.bash deleted file mode 100755 index 8770294..0000000 --- a/OpenWrt/linux_mint24_install_python2.7.bash +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# LinuxMint 24 -wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/libpython2.7_2.7.18-13ubuntu1.5_amd64.deb" - -wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/libpython2.7-stdlib_2.7.18-13ubuntu1.5_amd64.deb" - -wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/python2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb" - -wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/libpython2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb" - -sudo apt-get install libnsl2 - -sudo dpkg -i python2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb libpython2.7_2.7.18-13ubuntu1.5_amd64.deb libpython2.7-stdlib_2.7.18-13ubuntu1.5_amd64.deb libpython2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb - - - - diff --git a/OpenWrt/make_mini_openwrt_image.bash b/OpenWrt/make_mini_openwrt_image.bash deleted file mode 100755 index 5cd2a50..0000000 --- a/OpenWrt/make_mini_openwrt_image.bash +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/bash - -#sudo apt-get install subversion build-essential libncurses5-dev zlib1g-dev gawk git ccache gettext libssl-dev xsltproc -#17.01 -#sudo apt-get install zlib-devel-static - -#image_builder_url="https://downloads.openwrt.org/releases/17.01.7/targets/brcm47xx/legacy/lede-imagebuilder-17.01.7-brcm47xx-legacy.Linux-x86_64.tar.xz" -image_builder_url="https://downloads.openwrt.org/releases/19.07.7/targets/brcm47xx/legacy/openwrt-imagebuilder-19.07.7-brcm47xx-legacy.Linux-x86_64.tar.xz" -#image_builder_url="https://downloads.openwrt.org/releases/22.03.7/targets/bcm47xx/legacy/openwrt-imagebuilder-22.03.7-bcm47xx-legacy.Linux-x86_64.tar.xz" -#image_builder_url="https://downloads.openwrt.org/releases/18.06.9/targets/brcm47xx/legacy/openwrt-imagebuilder-18.06.9-brcm47xx-legacy.Linux-x86_64.tar.xz" - -file_name="${image_builder_url##*/}" -base="${file_name%.[^.]*.[^.]*}" -ext="${file_name:${#base} + 1}" - -image_builder_file=${file_name} -image_builder_dir=${base} - -echo ${file_name} ${base} ${ext} - -[ -f ./${image_builder_file} ] || wget ${image_builder_url} - -[ -d ./${image_builder_dir} ] || tar -xf ${image_builder_file} - -n2n_ipk="n2n-edge_HEAD-1_mipsel_mips32.ipk" -n2n_add="" - -! [ -f ./${n2n_ipk} ] || n2n_add="libcap kmod-tun n2n-edge" -cp ${n2n_ipk} ${image_builder_dir}/packages/${n2n_ipk} -cp ${n2n_ipk} ${image_builder_dir}/package/${n2n_ipk} - -cd ${image_builder_dir} - -#22.03.7 make image PROFILE=standard PACKAGES="base-files busybox ca-bundle dnsmasq dropbear firewall4 fstools kernel -kmod-b43 -kmod-gpio-button-hotplug -kmod-leds-gpio -kmod-nft-offload libc libgcc -libustream-wolfssl logd -mtd netifd -nftables nvram odhcp6c -odhcpd-ipv6only opkg otrx -ppp -ppp-mod-pppoe procd -procd-seccomp swconfig uci uclient-fetch urandom-seed -urngd -wpad-basic-wolfssl" -# block-mount kmod-usb-storage kmod-fs-ext4 kmod-usb-ohci kmod-usb2 ${n2n_add}" - -#18.06 19.07 -make image PROFILE=standard PACKAGES="-lcui -ppp -ppp-mod-pppoe base-files busybox dnsmasq dropbear firewall fstools -ip6tables iptables kernel -kmod-b43 -kmod-gpio-button-hotplug -kmod-ipt-offload -kmod-leds-gpio -kmod-ledtrig-default-on -kmod-ledtrig-netdev -kmod-ledtrig-timer libc libgcc logd mtd netifd nvram odhcp6c -odhcpd-ipv6only opkg otrx swconfig uci uclient-fetch -wpad-mini" -# block-mount kmod-usb-storage kmod-fs-ext4 kmod-usb-ohci kmod-usb2 ${n2n_add}" - -#17.01 make image V=s PROFILE=standard PACKAGES="base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd swconfig -wpad-mini nvram otrx -kmod-leds-gpio -kmod-gpio-button-hotplug -kmod-ledtrig-default-on -kmod-ledtrig-timer -kmod-ledtrig-netdev dnsmasq iptables -ip6tables -ppp -ppp-mod-pppoe firewall odhcpd -odhcp6c -kmod-b43" -# block-mount kmod-usb-storage kmod-fs-ext4 kmod-usb-ohci kmod-usb2 ${n2n_add}" - -# FILES=files/ - -make V=s info - -find . -name "*.trx" -find . -name "root.squashfs" -find . -name "*kernel.bin" diff --git a/Script/a_install b/Script/a_install index cef0003..9783f28 100644 --- a/Script/a_install +++ b/Script/a_install @@ -3,6 +3,7 @@ install_alt_linux_enable_sshd() { printf "Запуск sshd\n" + ask_continue && return sudo systemctl enable --now sshd.service } mkalias_with_prefix 'install_alt_linux_enable_sshd' @@ -10,6 +11,7 @@ mkalias_with_prefix 'install_alt_linux_enable_sshd' install_alt_linux_system_full_upgrade() { printf "Полное обновление системы\n" + ask_continue && return sudo apt-get update sudo apt-get dist-upgrade sudo update-kernel @@ -20,54 +22,271 @@ install_alt_linux_defaults() { printf "Установка важных программ\n" sudo apt-get install \ - pwgen xclip audacious audacity \ - gparted testdisk gnome-disk-utility baobab pv \ - cpu-x gnome-system-monitor \ - wol sshfs traceroute encfs openssh-server nmap\ - remmina xrdp qbittorrent \ - filezilla \ - geany geany-plugins screen git gitg gitk git-cola \ - golang sqlite3 nodejs \ - build-environment ctest gcc-c++ gcc clang \ - flex libncurses-devel \ - gimp pinta mypaint xviewer \ - firefox dillo links2 \ - vlc smtube mpv mplayer-gui ffmpeg cheese \ - redshift stellarium \ - minetest\ - texlive texstudio \ - systemd-settings-disable-kill-user-processes \ - retext pdfmod \ - gedit gedit-plugins gedit-plugin-devhelp gedit-plugins-latex \ - cinnamon-full idesk icewm pcmanfm volumeicon mc \ - nemo nemo-image-converter nemo-sendto-clamtk - nemo-arronax nemo-preview nemo-share \ - nemo-beesu-manager nemo-preview-gir-devel nemo-share-common \ - nemo-extensions-translations nemo-python nemo-terminal \ - nemo-fileroller nemo-python-devel nemo-translations \ - photorec\ - mp3info\ - frescobaldi lilypond \ - nano\ - token-manager \ - libgtop-gir libgtop-gir-devel \ - inkscape inkscape-viewer \ - meld kdiff3 \ - python3-module-pip \ - NetworkManager-tui \ - flatpak + pwgen xclip audacious audacity \ + gparted testdisk gnome-disk-utility baobab pv \ + cpu-x gnome-system-monitor \ + wol sshfs traceroute encfs openssh-server nmap\ + remmina xrdp qbittorrent \ + filezilla \ + geany geany-plugins screen git gitg gitk git-cola \ + golang sqlite3 nodejs \ + build-environment ctest gcc-c++ gcc clang \ + flex libncurses-devel \ + gimp pinta mypaint xviewer \ + firefox dillo links2 \ + vlc smtube mpv mplayer-gui ffmpeg cheese \ + redshift stellarium \ + minetest\ + texlive texstudio \ + systemd-settings-disable-kill-user-processes \ + retext pdfmod \ + gedit gedit-plugins gedit-plugin-devhelp gedit-plugins-latex \ + cinnamon-full idesk icewm pcmanfm volumeicon mc \ + nemo nemo-image-converter nemo-sendto-clamtk + nemo-arronax nemo-preview nemo-share \ + nemo-beesu-manager nemo-preview-gir-devel nemo-share-common \ + nemo-extensions-translations nemo-python nemo-terminal \ + nemo-fileroller nemo-python-devel nemo-translations \ + photorec\ + mp3info\ + frescobaldi lilypond \ + nano\ + token-manager \ + libgtop-gir libgtop-gir-devel \ + inkscape inkscape-viewer \ + meld kdiff3 \ + python3-module-pip \ + NetworkManager-tui \ + flatpak\ + tlp } mkalias_with_prefix 'install_alt_linux_defaults' install_alt_linux_skype_telegram_zoom() { printf "Установка skype telegram zoom\n" + ask_continue && return epm play skype epm play telegram epm play zoom } mkalias_with_prefix 'install_alt_linux_skype_telegram_zoom' +install_gedit_duplicate_plugin() +{ + printf "Установка плагина duplicate (CTRL+SHIFT+d)\n" + ask_continue && return + dir=~/.local/share/gedit/plugins/ + mkdir "${dir}" + cd ~/.local/share/gedit/plugins/ && git clone https://github.com/hannenz/duplicate +} +mkalias_with_prefix 'install_gedit_duplicate_plugin' + +install_gedit_duplicate_plugin() +{ + printf "Установка плагина duplicate (CTRL+SHIFT+d)\n" + ask_continue && return + dir=~/.local/share/gedit/plugins/ + mkdir "${dir}" + cd ~/.local/share/gedit/plugins/ && git clone https://github.com/hannenz/duplicate +} +mkalias_with_prefix 'install_gedit_duplicate_plugin' + + +install_n2n() +{ + printf "Установка n2n\n" + ask_continue && return + # n2n + wget https://github.com/ntop/n2n/releases/download/3.0/n2n-3.0.0-1038.x86_64.rpm + sudo apt-get install ./n2n-3.0.0-1038.x86_64.rpm +} +mkalias_with_prefix 'install_n2n' + +install_n2n_alt_rpi() +{ + printf "Установка n2n\n" + ask_continue && return + # n2n rpi altlinux + wget https://packages.ntop.org/RaspberryPI/bullseye_pi/arm64/n2n/n2n_3.1.1-76-g709590d_arm64.deb + sudo epm -i ./n2n_3.1.1-76-g709590d_arm64.deb +} +mkalias_with_prefix 'install_n2n_alt_rpi' + +install_n2n_enable() +{ + printf "Запуск n2n\n" + ask_continue && return + sudo systemctl enable --now edge.service +} +mkalias_with_prefix 'install_n2n_enable' + +install_flathub_add() +{ + printf "Добавление репозитория flathub\n" + ask_continue && return + flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo +} +mkalias_with_prefix 'install_flathub_add' + +install_flatpak_organicmaps() +{ + printf "Установка organicmaps\n" + ask_continue && return + ## organicmaps + flatpak install flathub app.organicmaps.desktop + #flatpak remote-info --log flathub app.organicmaps.desktop + #sudo flatpak update --commit=beb1e1a66d50646cfe162437bca7b19fdd9178e3f505fcdc351a74415dbca628 app.organicmaps.desktop + #flatpak run app.organicmaps.desktop +} +mkalias_with_prefix 'install_flatpak_organicmaps' + +install_flatpak_appimagepool() +{ + printf "Установка appimagepool\n" + ask_continue && return + flatpak install flathub io.github.prateekmedia.appimagepool +} +mkalias_with_prefix 'install_flatpak_appimagepool' + +install_flatpak_AndroidStudio() +{ + printf "Установка AndroidStudio\n" + ask_continue && return + # AndroidStudio + flatpak install flathub com.google.AndroidStudio +} +mkalias_with_prefix 'install_flatpak_AndroidStudio' + +install_XnConvert() +{ + printf "Установка XnConvert\n" + #ask_continue && return + # XnConvert + echo 'Download: https://www.xnview.com/en/xnconvert/#downloads' + echo 'sudo epm install ./XnConvert-linux-x64.deb' +} +mkalias_with_prefix 'install_XnConvert' + +install_tuxguitar() +{ + printf "Установка tuxguitar\n" + ask_continue && return + # tuxguitar + wget -c https://github.com/helge17/tuxguitar/releases/download/1.6.0/tuxguitar-1.6.0_linux-swt.x86_64.rpm + sudo apt-get install ./tuxguitar-1.6.0_linux-swt.x86_64.rpm +} +mkalias_with_prefix 'install_tuxguitar' + +install_Gps() +{ + printf "Установка Gps\n" + ask_continue && return + # Gps + sudo apt-get install xgps gpsd gpsmon + echo 'Запишите в /etc/sysconfig/gpsd -> + OPTIONS="-n" + DEVICES="/dev/ttyACM0 /dev/ttyACM1"' +} +mkalias_with_prefix 'install_Gps' + +install_thinkfan() +{ + printf "Установка thinkfan\n" + ask_continue && return + # thinkpad + sudo apt-get install thinkfan + echo "options thinkpad_acpi fan_control=1" > /etc/modprobe.d/thinkpad_acpi.conf + echo 'Запишите в mcedit /etc/thinkfan.conf -> + tp_fan /proc/acpi/ibm/fan + hwmon /sys/class/thermal/thermal_zone0/temp + (0, 0, 60) + (1, 53, 65) + (2, 55, 66) + (3, 57, 68) + (4, 61, 70) + (5, 64, 71) + (7, 68, 32767) + # test: + sudo /usr/sbin/thinkfan -n + # run: + systemctl enable --now thinkfan.service + ' +} +mkalias_with_prefix 'install_thinkfan' + +install_max_freq() +{ + printf "Установка максимальной частоты процессора\n" + ask_continue && return + # Set max freq + echo 'Выполнить + EDITOR=mcedit crontab -e + Записать туда + @reboot cpupower frequency-set --max 2.3G' +} +mkalias_with_prefix 'install_max_freq' + +install_git_editor_set() +{ + printf "Установка git_editor\n" + ask_continue && return + # git + git config --global core.editor mcedit +} +mkalias_with_prefix 'install_git_editor_set' + +install_disable_autostart_gnome_software() +{ + printf "Отключить автозапуск gnome_software\n" + ask_continue && return + # Disable autostart gnome-software + mkdir -pv ~/.config/autostart && cp /etc/xdg/autostart/gnome-software-service.desktop ~/.config/autostart/ + echo "X-GNOME-Autostart-enabled=false" >> ~/.config/autostart/gnome-software-service.desktop + dconf write /org/gnome/desktop/search-providers/disabled "['org.gnome.Software.desktop']" + + dconf write /org/gnome/software/allow-updates false + dconf write /org/gnome/software/download-updates false +} +mkalias_with_prefix 'install_disable_autostart_gnome_software' + +install_fuse_config() +{ + printf "Установка возможности пользоваться fusermount обычным пользователям для AltLinux\n" + ask_continue && return + # Fuse config + sudo control fusermount public +} +mkalias_with_prefix 'install_fuse_config' + +install_wifi_for_Android_13_in_altlinux() +{ + printf "Установка возможности пользоваться fusermount обычным пользователям для AltLinux\n" + ask_continue && return + # Enable wi-fi for Android 13 in altlinux + nmcli connection modify WIFINAME wifi-sec.pmf 1 +} +mkalias_with_prefix 'install_wifi_for_Android_13_in_altlinux' + +install_set_macperf_andcharge_80() +{ + printf "Максимальная производительность и заряд в 80%\n" + ask_continue && return + # Установить максимальный уровень заряда и поизводительности + #sudo apt-get install tlp + sudo echo "80" > /sys/class/power_supply/BAT0/charge_control_end_threshold + sudo echo "80" > /sys/devices/system/cpu/intel_pstate/max_perf_pct +} +mkalias_with_prefix 'install_set_macperf_andcharge_80' + +install_headers() +{ + printf "Установка заголовков для исходного кода ядра linux-headers\n" + ask_continue && return + sudo apt-get install linux-headers-`uname -r` +} +mkalias_with_prefix 'install_headers' + install_linux_mint_default() { @@ -85,4 +304,19 @@ install_linux_mint_default() } mkalias_with_prefix 'install_linux_mint_default' +install_linux_mint_python2_7() +{ + # LinuxMint 24 + wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/libpython2.7_2.7.18-13ubuntu1.5_amd64.deb" + + wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/libpython2.7-stdlib_2.7.18-13ubuntu1.5_amd64.deb" + wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/python2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb" + + wget "https://archive.ubuntu.com/ubuntu/pool/universe/p/python2.7/libpython2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb" + + sudo apt-get install libnsl2 + + sudo dpkg -i python2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb libpython2.7_2.7.18-13ubuntu1.5_amd64.deb libpython2.7-stdlib_2.7.18-13ubuntu1.5_amd64.deb libpython2.7-minimal_2.7.18-13ubuntu1.5_amd64.deb +} +mkalias_with_prefix 'install_linux_mint_python2_7' diff --git a/Script/a_openwrt b/Script/a_openwrt new file mode 100644 index 0000000..148317a --- /dev/null +++ b/Script/a_openwrt @@ -0,0 +1,116 @@ +#!/bin/bash + +openwrt_make_mini_openwrt_image_prep_install() +{ + printf "Установка компонентов для sshd openwrt_make_mini_openwrt_image\n" + ask_continue && return + sudo apt-get install subversion build-essential libncurses5-dev zlib1g-dev gawk git ccache gettext libssl-dev xsltproc + #17.01 + sudo apt-get install zlib-devel-static +} +mkalias_with_prefix 'openwrt_make_mini_openwrt_image_prep_install' + +openwrt_make_mini_openwrt_image() +{ + printf "Загрузка sshd\n" + ask_continue && return + image_builder_url=$1 + pkg=$2 + #image_builder_url="https://downloads.openwrt.org/releases/17.01.7/targets/brcm47xx/legacy/lede-imagebuilder-17.01.7-brcm47xx-legacy.Linux-x86_64.tar.xz" + image_builder_url="https://downloads.openwrt.org/releases/19.07.7/targets/brcm47xx/legacy/openwrt-imagebuilder-19.07.7-brcm47xx-legacy.Linux-x86_64.tar.xz" + #image_builder_url="https://downloads.openwrt.org/releases/22.03.7/targets/bcm47xx/legacy/openwrt-imagebuilder-22.03.7-bcm47xx-legacy.Linux-x86_64.tar.xz" + #image_builder_url="https://downloads.openwrt.org/releases/18.06.9/targets/brcm47xx/legacy/openwrt-imagebuilder-18.06.9-brcm47xx-legacy.Linux-x86_64.tar.xz" + + file_name="${image_builder_url##*/}" + base="${file_name%.[^.]*.[^.]*}" + ext="${file_name:${#base} + 1}" + + image_builder_file=${file_name} + image_builder_dir=${base} + + echo ${file_name} ${base} ${ext} + + [ -f ./${image_builder_file} ] || wget ${image_builder_url} + + [ -d ./${image_builder_dir} ] || tar -xf ${image_builder_file} + + n2n_ipk="n2n-edge_HEAD-1_mipsel_mips32.ipk" + n2n_add="" + + ! [ -f ./${n2n_ipk} ] || n2n_add="libcap kmod-tun n2n-edge" + cp ${n2n_ipk} ${image_builder_dir}/packages/${n2n_ipk} + cp ${n2n_ipk} ${image_builder_dir}/package/${n2n_ipk} + + cd ${image_builder_dir} + + make image V=s PROFILE=standard PACKAGES="${pkg}" + # FILES=files/ + + make V=s info + + find . -name "*.trx" + find . -name "root.squashfs" + find . -name "*kernel.bin" +} + + #image_builder_url= + +openwrt_make_mini_openwrt_image_17_01() +{ + printf "Создание mini_openwrt_image для версии 17_01\n" + ask_continue && return + url="https://downloads.openwrt.org/releases/17.01.7/targets/brcm47xx/legacy/lede-imagebuilder-17.01.7-brcm47xx-legacy.Linux-x86_64.tar.xz" + pkg="base-files libc libgcc busybox dropbear mtd uci opkg netifd fstools uclient-fetch logd swconfig -wpad-mini nvram otrx -kmod-leds-gpio -kmod-gpio-button-hotplug -kmod-ledtrig-default-on -kmod-ledtrig-timer -kmod-ledtrig-netdev dnsmasq iptables -ip6tables -ppp -ppp-mod-pppoe firewall odhcpd -odhcp6c -kmod-b43" + # block-mount kmod-usb-storage kmod-fs-ext4 kmod-usb-ohci kmod-usb2 ${n2n_add}" + openwrt_make_mini_openwrt_image "${url}" "${pkg}" +} +mkalias_with_prefix 'openwrt_make_mini_openwrt_image_17_01' + +openwrt_make_mini_openwrt_image_18_06() +{ + printf "Создание mini_openwrt_image для версии 18_06\n" + ask_continue && return + url="https://downloads.openwrt.org/releases/18.06.9/targets/brcm47xx/legacy/openwrt-imagebuilder-18.06.9-brcm47xx-legacy.Linux-x86_64.tar.xz" + pkg="-lcui -ppp -ppp-mod-pppoe base-files busybox dnsmasq dropbear firewall fstools -ip6tables iptables kernel -kmod-b43 -kmod-gpio-button-hotplug -kmod-ipt-offload -kmod-leds-gpio -kmod-ledtrig-default-on -kmod-ledtrig-netdev -kmod-ledtrig-timer libc libgcc logd mtd netifd nvram odhcp6c -odhcpd-ipv6only opkg otrx swconfig uci uclient-fetch -wpad-mini" + # 'block-mount kmod-usb-storage kmod-fs-ext4 kmod-usb-ohci kmod-usb2 ${n2n_add}' + openwrt_make_mini_openwrt_image "${url}" "${pkg}" +} +mkalias_with_prefix 'openwrt_make_mini_openwrt_image_18_06' + +openwrt_make_mini_openwrt_image_19_07() +{ + printf "Создание mini_openwrt_image для версии 19_07\n" + ask_continue && return + url="https://downloads.openwrt.org/releases/19.07.7/targets/brcm47xx/legacy/openwrt-imagebuilder-19.07.7-brcm47xx-legacy.Linux-x86_64.tar.xz" + pkg="-lcui -ppp -ppp-mod-pppoe base-files busybox dnsmasq dropbear firewall fstools -ip6tables iptables kernel -kmod-b43 -kmod-gpio-button-hotplug -kmod-ipt-offload -kmod-leds-gpio -kmod-ledtrig-default-on -kmod-ledtrig-netdev -kmod-ledtrig-timer libc libgcc logd mtd netifd nvram odhcp6c -odhcpd-ipv6only opkg otrx swconfig uci uclient-fetch -wpad-mini" + # 'block-mount kmod-usb-storage kmod-fs-ext4 kmod-usb-ohci kmod-usb2 ${n2n_add}' + openwrt_make_mini_openwrt_image "${url}" "${pkg}" +} +mkalias_with_prefix 'openwrt_make_mini_openwrt_image_19_07' + +openwrt_make_mini_openwrt_image_22_03() +{ + printf "Создание mini_openwrt_image для версии 22_03\n" + ask_continue && return + url="https://downloads.openwrt.org/releases/22.03.7/targets/bcm47xx/legacy/openwrt-imagebuilder-22.03.7-bcm47xx-legacy.Linux-x86_64.tar.xz" + pkg="base-files busybox ca-bundle dnsmasq dropbear firewall4 fstools kernel -kmod-b43 -kmod-gpio-button-hotplug -kmod-leds-gpio -kmod-nft-offload libc libgcc -libustream-wolfssl logd -mtd netifd -nftables nvram odhcp6c -odhcpd-ipv6only opkg otrx -ppp -ppp-mod-pppoe procd -procd-seccomp swconfig uci uclient-fetch urandom-seed -urngd -wpad-basic-wolfssl" + # block-mount kmod-usb-storage kmod-fs-ext4 kmod-usb-ohci kmod-usb2 ${n2n_add}" + openwrt_make_mini_openwrt_image "${url}" "${pkg}" +} +mkalias_with_prefix 'openwrt_make_mini_openwrt_image_22_03' + +openwrt_n2n_for_openwrt_routers() +{ + printf "Загрузка sshd\n" + ask_continue && return +} +mkalias_with_prefix 'openwrt_' + +openwrt_() +{ + printf "Загрузка sshd\n" + ask_continue && return +} +#mkalias_with_prefix 'openwrt_' + + diff --git a/Script/alias_main b/Script/alias_main index 5fb62c8..1b54ca9 100755 --- a/Script/alias_main +++ b/Script/alias_main @@ -7,6 +7,17 @@ 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}/a_install" source "${alias_dir}/a_pdf" source "${alias_dir}/a_hdd" @@ -16,39 +27,39 @@ alias ${prefix}archive_each_file_into_separate_archive="find . -mindepth 1 -maxd unicode_U200B_correct () { [ $1 == '' ] && printf "Корректировка ошибки в latex U200B\nУкажите входной файл" && return - perl -CSD -pe "s/\N{U+200B}//gu" < $1 > noU200B_$1 + perl -CSD -pe "s/\N{U+200B}//gu" < $1 > noU200B_$1 } mkalias_with_prefix 'unicode_U200B_correct' festival_txt2mp3 () { [ $1 == '' ] && printf "Озвучивание текста\nУкажите входной текстовый файл. Выходной будет с тем же именем, но mp3\n" && return - in_file=$1 - out_wav_file_name="$1.wav" - out_mp3_file_name="$1.mp3" - cat "$1" | sed 's/[^a-zA-ZА-Яа-я0-9., ]//g' | text2wave -o "$out_wav_file_name" - lame "$out_wav_file_name" "$out_mp3_file_name" - rm "$out_wav_file_name" + in_file=$1 + out_wav_file_name="$1.wav" + out_mp3_file_name="$1.mp3" + cat "$1" | sed 's/[^a-zA-ZА-Яа-я0-9., ]//g' | text2wave -o "$out_wav_file_name" + lame "$out_wav_file_name" "$out_mp3_file_name" + rm "$out_wav_file_name" } mkalias_with_prefix 'festival_txt2mp3' encode_240() { [ $1 == '' ] && printf "Перекодирование видео в формат 240*180\nУкажите входной шаблон. Например '*.mp4'\n" && return - for filename in "$1"; do - echo "Take '${filename}'"; - if [ -f "${filename}" ]; then - echo "Make '${filename}'"; - ffmpeg -i "${filename}" -vcodec libx264 -vb 50K -s 240x180 -acodec libmp3lame -ab 16K -strict -2 "${filename}_240.mkv" - fi - done + for filename in "$1"; do + echo "Take '${filename}'"; + if [ -f "${filename}" ]; then + echo "Make '${filename}'"; + ffmpeg -i "${filename}" -vcodec libx264 -vb 50K -s 240x180 -acodec libmp3lame -ab 16K -strict -2 "${filename}_240.mkv" + fi + done } mkalias_with_prefix 'encode_240' union_video_and_audio() { [ $1 == '' ] && printf "Объедидение видео и аудио\nУкажите входной файл видео и аудио. Например: 1.mp4 1.wav\n" && return - ffmpeg -i $1 -i $2 -c:a aac -b:a 128k -vcodec copy -map 0:v -map 1:a o.mp4 + ffmpeg -i $1 -i $2 -c:a aac -b:a 128k -vcodec copy -map 0:v -map 1:a o.mp4 } mkalias_with_prefix 'union_video_and_audio' @@ -57,36 +68,36 @@ alias ${prefix}download_yt_dlp="${vd}" download_worst() { - cmd="${vd} -f 'worst/worstvideo+worstaudio' -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $1" - eval $cmd + cmd="${vd} -f 'worst/worstvideo+worstaudio' -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $1" + eval $cmd } mkalias_with_prefix 'download_worst' download_best() { - cmd="${vd} -f 'best/bestvideo+bestaudio' -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $1" - eval $cmd + cmd="${vd} -f 'best/bestvideo+bestaudio' -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $1" + eval $cmd } mkalias_with_prefix 'download_best' download_worst_audio() { - cmd="${vd} -f 'worstaudio' -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $1" - eval $cmd + cmd="${vd} -f 'worstaudio' -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $1" + eval $cmd } mkalias_with_prefix 'download_worst_audio' download_format_list() { - cmd="${vd} -F $1" - eval $cmd + cmd="${vd} -F $1" + eval $cmd } mkalias_with_prefix 'download_format_list' download_custom() { - cmd="${vd} -f $1 -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $2" - eval $cmd + cmd="${vd} -f $1 -R 10000 -i -o '%(upload_date)s-%(title)s-%(id)s.%(ext)s' $2" + eval $cmd } mkalias_with_prefix 'download_custom' @@ -125,15 +136,15 @@ mkalias_with_prefix 'resize_and_del_exif' ssh_del_known_host() { - in_host_pattern=$1 - [ "${in_host_pattern}" = "" ] && printf "Укажите шаблон адреса, например '192.168.1.'\n" && return + in_host_pattern=$1 + [ "${in_host_pattern}" = "" ] && printf "Укажите шаблон адреса, например '192.168.1.'\n" && return eval "sudo cp -u ~/.ssh/known_hosts ~/.ssh/known_hosts.backup && cat ~/.ssh/known_hosts.backup | grep -v ${in_host_pattern} > ~/.ssh/known_hosts" } mkalias_with_prefix 'ssh_del_known_host' ssh_for_openwpt_10.3_kamikadze() { - in_host_pattern=$1 + in_host_pattern=$1 ssh -oKexAlgorithms=+diffie-hellman-group1-sha1 -c 3des-cbc ${in_host_pattern} } @@ -141,8 +152,25 @@ mkalias_with_prefix 'ssh_for_openwpt_10.3_kamikadze' rand_string() { - tr -dc A-Za-z0-9 < /dev/urandom | dd bs=${RANDOM:1:2} count=1 2>/dev/null + tr -dc A-Za-z0-9 < /dev/urandom | dd bs=${RANDOM:1:2} count=1 2>/dev/null } mkalias_with_prefix 'rand_string' +check_internet_script() +{ + host="ya.ru" + + while true; do + result=$(ping -c 3 $host | tail -2 | head -1 | awk '{print $4}') + if [ $result -eq 0 ]; then + echo "Нет интернета" + break + fi + sleep 180 + done +} +mkalias_with_prefix 'check_internet_script' + + + diff --git a/install.sh b/install.sh deleted file mode 100644 index ebcbc4f..0000000 --- a/install.sh +++ /dev/null @@ -1,149 +0,0 @@ -#!/bin/bash - -# Linux Mint - -sudo aptitude install chromium-browser gimp geany geany-plugins screen \ - gcc virtualbox-qt virtualbox-ext-pack icewm idesk dillo links2 smtube \ - vlc mpv mc openssh-server mplayer-gui texstudio volumeicon-alsa \ - p7zip-full git falkon ffmpeg remmina remmina-plugin-rdp xrdp \ - remmina-plugin-vnc nmap gparted lxterminal redshift stellarium \ - minetest widelands chromium-browser-l10n sshfs encfs\ - pcmanfm xclip clang clang-4.0 clang-3.9 gitg gitk git-cola \ - texlive-full pwgen mmv cheese gxneur xneur tuxguitar audacious \ - deluge easystroke - -sudo apt install --install-recommends winehq-stable - -# ----------------------------------------------------------------------- -# Alt Linux -sudo systemctl enable --now sshd.service - -sudo apt-get update -sudo apt-get dist-upgrade -sudo update-kernel - -sudo apt-get install \ - pwgen xclip audacious audacity \ - gparted testdisk gnome-disk-utility baobab pv \ - cpu-x gnome-system-monitor \ - wol sshfs traceroute encfs openssh-server nmap\ - remmina xrdp qbittorrent \ - filezilla \ - geany geany-plugins screen git gitg gitk git-cola \ - golang sqlite3 nodejs \ - build-environment ctest gcc-c++ gcc clang \ - flex libncurses-devel \ - gimp pinta mypaint xviewer \ - firefox dillo links2 \ - vlc smtube mpv mplayer-gui ffmpeg cheese \ - redshift stellarium \ - minetest\ - texlive texstudio \ - systemd-settings-disable-kill-user-processes \ - retext pdfmod \ - gedit gedit-plugins gedit-plugin-devhelp gedit-plugins-latex \ - cinnamon-full idesk icewm pcmanfm volumeicon mc \ - nemo nemo-image-converter nemo-sendto-clamtk - nemo-arronax nemo-preview nemo-share \ - nemo-beesu-manager nemo-preview-gir-devel nemo-share-common \ - nemo-extensions-translations nemo-python nemo-terminal \ - nemo-fileroller nemo-python-devel nemo-translations \ - photorec\ - mp3info\ - frescobaldi lilypond \ - nano\ - token-manager \ - libgtop-gir libgtop-gir-devel \ - inkscape inkscape-viewer \ - meld kdiff3 \ - python3-module-pip \ - NetworkManager-tui \ - flatpak - -# Gedit plugins -git clone https://github.com/hannenz/duplicate - -epm play skype -epm play telegram -epm play zoom - -# n2n -wget https://github.com/ntop/n2n/releases/download/3.0/n2n-3.0.0-1038.x86_64.rpm -sudo apt-get install ./n2n-3.0.0-1038.x86_64.rpm -# n2n rpi altlinux -wget https://packages.ntop.org/RaspberryPI/bullseye_pi/arm64/n2n/n2n_3.1.1-76-g709590d_arm64.deb -sudo epm -i ./n2n_3.1.1-76-g709590d_arm64.deb - -sudo systemctl enable --now edge.service - -## Flathub -flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo -## organicmaps -flatpak install flathub app.organicmaps.desktop -flatpak remote-info --log flathub app.organicmaps.desktop -#sudo flatpak update --commit=beb1e1a66d50646cfe162437bca7b19fdd9178e3f505fcdc351a74415dbca628 app.organicmaps.desktop -flatpak run app.organicmaps.desktop - -# appimagepool -flatpak install flathub io.github.prateekmedia.appimagepool -# AndroidStudio -flatpak install flathub com.google.AndroidStudio - -# XnConvert -Download: https://www.xnview.com/en/xnconvert/#downloads -sudo epm install ./XnConvert-linux-x64.deb - -# tuxguitar -wget -c https://github.com/helge17/tuxguitar/releases/download/1.6.0/tuxguitar-1.6.0_linux-swt.x86_64.rpm -sudo apt-get install ./tuxguitar-1.6.0_linux-swt.x86_64.rpm - -# Gps -sudo apt-get install xgps gpsd gpsmon -/etc/sysconfig/gpsd -> -OPTIONS="-n" -DEVICES="/dev/ttyACM0 /dev/ttyACM1" - -# thinkpad x220 -sudo apt-get install thinkfan -echo "options thinkpad_acpi fan_control=1" > /etc/modprobe.d/thinkpad_acpi.conf -mcedit /etc/thinkfan.conf -> -tp_fan /proc/acpi/ibm/fan -hwmon /sys/class/thermal/thermal_zone0/temp -(0, 0, 60) -(1, 53, 65) -(2, 55, 66) -(3, 57, 68) -(4, 61, 70) -(5, 64, 71) -(7, 68, 32767) - -# test: -sudo /usr/sbin/thinkfan -n -# run: -systemctl enable --now thinkfan.service - -# Set max freq -EDITOR=mcedit crontab -e -@reboot cpupower frequency-set --max 2.3G - -# git -git config --global core.editor mcedit - -# Disable autostart gnome-software -mkdir -pv ~/.config/autostart && cp /etc/xdg/autostart/gnome-software-service.desktop ~/.config/autostart/ -echo "X-GNOME-Autostart-enabled=false" >> ~/.config/autostart/gnome-software-service.desktop -dconf write /org/gnome/desktop/search-providers/disabled "['org.gnome.Software.desktop']" - -dconf write /org/gnome/software/allow-updates false -dconf write /org/gnome/software/download-updates false - -# Fuse config -sudo control fusermount public - -# Enable wi-fi for Android 13 in altlinux -nmcli connection modify WIFINAME wifi-sec.pmf 1 - -# Установить максимальный уровень заряда и поизводительности -sudo apt-get install tlp -sudo echo "80" > /sys/class/power_supply/BAT0/charge_control_end_threshold -sudo echo "80" > /sys/devices/system/cpu/intel_pstate/max_perf_pct