From 393552e69d0fdf3a7d7ed5ca01a7a4a313088a9d Mon Sep 17 00:00:00 2001 From: Luk Lu Date: Sat, 14 Jan 2023 12:33:11 +0800 Subject: [PATCH] u --- debian-config.sh | 4 +-- debian-ddinstall-debi.sh | 32 +++++++++++++++++++ ...dinstall.sh => debian-ddinstall-moeclub.sh | 2 ++ debian-show-version.sh | 30 +++++++++++++++++ home-config.sh | 3 +- macos/config-mac.sh => mac-config.sh | 0 ...all-homebrew.sh => mac-install-homebrew.sh | 0 ...-temperature.sh => mac-show-temperature.sh | 0 8 files changed, 68 insertions(+), 3 deletions(-) create mode 100644 debian-ddinstall-debi.sh rename debian-ddinstall.sh => debian-ddinstall-moeclub.sh (97%) mode change 100755 => 100644 create mode 100644 debian-show-version.sh rename macos/config-mac.sh => mac-config.sh (100%) mode change 100755 => 100644 rename macos/install-homebrew.sh => mac-install-homebrew.sh (100%) mode change 100755 => 100644 rename macos/show-temperature.sh => mac-show-temperature.sh (100%) mode change 100755 => 100644 diff --git a/debian-config.sh b/debian-config.sh index 0c7bd62..9725cb0 100755 --- a/debian-config.sh +++ b/debian-config.sh @@ -41,13 +41,13 @@ then fi echo -echo "=== Configure /etc/sudoers: includedir /etc/sudoers.d" +echo "=== Configure /etc/sudoers to includedir /etc/sudoers.d" #sed -i "s|%sudo\s\+ALL=(ALL:ALL)\sALL|%sudo\tALL=(ALL:ALL) NOPASSWD:ALL|g" /etc/sudoers # allow all users in %sudo group to sudo without password DebianVersionMain=`cat /etc/debian_version | sed -r 's/^([0-9]+)\..*$/\1/'` if [ "$DebianVersionMain" == '10' ] then chmod o+w /etc/sudoers - ## Debian 10 上，不存在 @includedir，需要自己添加。而 Debian 11.1 上，已经存在 @includedir + ## Debian 10 上，不存在 includedir，需要自己添加。而 Debian 11.1 上，已经存在 @includedir sed -i "s|#includedir /etc/sudoers.d|includedir /etc/sudoers.d|g" /etc/sudoers # allow users in /etc/sudoers.d/ folder to sudo chmod o-w /etc/sudoers fi diff --git a/debian-ddinstall-debi.sh b/debian-ddinstall-debi.sh new file mode 100644 index 0000000..a1e5d8e --- /dev/null +++ b/debian-ddinstall-debi.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +echo "Thanks https://github.com/bohanyang/debi" +echo + +echo "=== Enter debian version [8,9,10,11,12] or [leave blank] for 11" +read -p ">>> " DEBIAN_VERSION +if [ -z "${DEBIAN_VERSION}" ] +then + DEBIAN_VERSION=11 +fi + +echo "=== Enter architecture [amd64, i386, arm64, armhf] or [leave blank] for amd64" +read -p ">>> " DEBIAN_ARCH +if [ -z "${DEBIAN_ARCH}" ] +then + DEBIAN_ARCH=amd64 +fi + +echo "=== Enter presets to download from [cdn, aws, china] or [leave blank] for cdn" +read -p ">>> " PRESET +if [ -z "${PRESET}" ] +then + PRESET=cdn +fi + +sudo curl -fLO https://raw.githubusercontent.com/bohanyang/debi/master/debi.sh +sudo chmod a+rx debi.sh +sudo ./debi.sh --version $DEBIAN_VERSION --architecture $DEBIAN_ARCH --user root --$PRESET # --architecture 可参略，默认为 amd64；--password 可省略，则脚本启动后会问你要密码 + +echo "=== Shutdown now, wait for about 30 seconds, then try to ssh" +sudo shutdown -r now diff --git a/debian-ddinstall.sh b/debian-ddinstall-moeclub.sh old mode 100755 new mode 100644 similarity index 97% rename from debian-ddinstall.sh rename to debian-ddinstall-moeclub.sh index 2707337..9eaa24b --- a/debian-ddinstall.sh +++ b/debian-ddinstall-moeclub.sh @@ -1,3 +1,5 @@ +#!/bin/bash + read -p "Enter root password (default to 'MoeClub.org') >> " ROOTPWD read -p "Enter debian version to install (default to 11)>> " DEBIAN_VERSION diff --git a/debian-show-version.sh b/debian-show-version.sh new file mode 100644 index 0000000..3878ced --- /dev/null +++ b/debian-show-version.sh @@ -0,0 +1,30 @@ +#!/bin/bash + +echo ">>> cat /etc/issue" +cat /etc/issue +echo + +echo ">>> cat /etc/debian_version" +cat /etc/debian_version +echo + +echo ">>> cat /etc/os-release" +cat /etc/os-release +echo + +echo ">>> cat /etc/cpuinfo" +cat /etc/cpuinfo +echo + +# echo ">>> lsb-release" +# apt install lsb-release +# lsb-release -a +# echo + +echo ">>> hostnamectl" +hostnamectl +echo + +echo ">>> uname -a" +uname -a +echo \ No newline at end of file diff --git a/home-config.sh b/home-config.sh index 3bde69e..4bbd616 100755 --- a/home-config.sh +++ b/home-config.sh @@ -29,6 +29,7 @@ elif [ -d $NIXHOME5 ] then NIXHOME=$NIXHOME5 else + echo ××× none of the testing path is valid. echo "=== Enter [nixhome path] or leave [blank] to exit" read -p ">>> " NIXHOME echo "" @@ -101,7 +102,7 @@ then # 由 root 指定新用户而创建的配置文件的 owner 是 root，而不是新用户，导致新用户无法读取该文件而密钥登录失败，因此要重设 owner。 chown $TheUser:$TheUser $HomePath/.ssh fi - if [ -e '$HomePath/.ssh/authorized_keys' ] + if [ -e "$HomePath/.ssh/authorized_keys" ] then mv $HomePath/.ssh/authorized_keys $HomePath/.ssh/authorized_keys.backup-$(date +%Y%m%dT%H%M%S) fi diff --git a/macos/config-mac.sh b/mac-config.sh old mode 100755 new mode 100644 similarity index 100% rename from macos/config-mac.sh rename to mac-config.sh diff --git a/macos/install-homebrew.sh b/mac-install-homebrew.sh old mode 100755 new mode 100644 similarity index 100% rename from macos/install-homebrew.sh rename to mac-install-homebrew.sh diff --git a/macos/show-temperature.sh b/mac-show-temperature.sh old mode 100755 new mode 100644 similarity index 100% rename from macos/show-temperature.sh rename to mac-show-temperature.sh