diff --git a/files/exa-linux-x86_64-v0.10.1.zip b/files/exa-linux-x86_64-v0.10.1.zip deleted file mode 100644 index 50d5b11..0000000 Binary files a/files/exa-linux-x86_64-v0.10.1.zip and /dev/null differ diff --git a/files/eza_x86_64-unknown-linux-musl.zip b/files/eza_x86_64-unknown-linux-musl.zip new file mode 100644 index 0000000..9ca7dee Binary files /dev/null and b/files/eza_x86_64-unknown-linux-musl.zip differ diff --git a/init_priv.sh b/init_priv.sh index 1b7bcde..2335e74 100755 --- a/init_priv.sh +++ b/init_priv.sh @@ -34,21 +34,38 @@ configure_upgrade() { fi } +configure_install_basic() { + [ "$1" != "noupdate" ] && sudo apt update + sudo apt install tmux git curl htop net-tools tar unzip -y +} + +configure_install_useful() { + [ "$1" != "noupdate" ] && sudo apt update + sudo apt install hexyl bat neofetch fd-find fzf tcptraceroute -y + pip3 install trash-cli +} + +configure_install_new() { + [ "$1" != "noupdate" ] && sudo apt update + sudo apt install pigz -y + pip3 install speedtest-cli +} + +configure_install_eza() { + if ! command_exists eza; then + unzip $scriptdir/files/eza_x86_64-unknown-linux-musl.zip -d $tempdir/eza + sudo cp $tempdir/eza/eza /usr/local/bin/ + rm $tempdir/eza -r + fi +} + configure_install() { if confirm_action "要运行 apt/pip3 install 吗?" "N"; then sudo apt update - sudo apt install tmux git curl htop net-tools tcptraceroute tar unzip -y - sudo apt install hexyl bat neofetch fd-find fzf pigz -y - pip3 install trash-cli speedtest-cli - - sudo apt install exa -y - if [ $? -ne 0 ]; then - unzip $scriptdir/files/exa-linux-x86_64-v0.10.1.zip -d $tempdir/exa - sudo cp $tempdir/exa/bin/* /usr/local/bin/ - sudo cp $tempdir/exa/man/* /usr/share/man/man1/ - sudo cp $tempdir/exa/completions/exa.zsh /usr/local/share/zsh/site-functions - rm $tempdir/exa -r - fi + configure_install_basic noupdate + configure_install_useful noupdate + configure_install_new noupdate + configure_install_eza noupdate fi } @@ -194,6 +211,26 @@ configure_oomkiller() { fi } +configure_swap() { + # Create a virtual memory file + sudo dd if=/dev/zero of=/mnt/swap bs=1M count=4096 + sudo chmod 0600 /mnt/swap + sudo mkswap /mnt/swap + sudo swapon /mnt/swap + # Write auto mount parameters + if ! grep -q swap /etc/fstab; then + echo "/mnt/swap swap swap defaults 0 0" >> /etc/fstab + fi + # Set virtual memory usage + if ! grep -q swappiness /etc/sysctl.conf; then + echo "vm.swappiness = 10" >> /etc/sysctl.conf + else + sed -i 's/vm.swappiness = 0/vm.swappiness = 10/' /etc/sysctl.conf + fi + # Make the configuration take effect + sysctl -p +} + # ============================================================ if [ $# -ne 0 ]; then