This commit is contained in:
hl committed 2024-11-16 23:40:50 +08:00
1 parent 11ce93eaa1
commit 96771bcb15
3 files changed
+19 -37

No files matched your search

+5 -15
View File
@@ -9,6 +9,7 @@ case $OS_CODE in
bookworm) OS_VERSION="12" ;;
Trixie) OS_VERSION="13" ;;
esac
DISTRO_PVE=$((command -v pvesh &>/dev/null && echo 1) || echo 0)
SCRIPT=$(readlink -f "$0")
SCRIPTPATH=$(dirname "$SCRIPT")
@@ -83,7 +84,7 @@ Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
Architectures: $OS_ARCH
" | tee /etc/apt/sources.list.d/debian.sources
if [ $FOR_PVE -eq 1 ]; then
if [ $DISTRO_PVE -eq 1 ]; then
echo -e "Types: deb
URIs: $PVE_URL
Suites: $OS_CODE
@@ -98,7 +99,7 @@ Signed-By: /etc/apt/trusted.gpg.d/proxmox-release-$OS_CODE.gpg
$command install -y ca-certificates curl gnupg lsb-release zsh
if [ $FOR_PVE -eq 0 ]; then
if [ $DISTRO_PVE -eq 0 ]; then
echo -e "Types: deb
URIs: $DOCKER_URL
Suites: $OS_CODE
@@ -124,21 +125,15 @@ Architectures: $OS_ARCH
usermod -s /usr/bin/zsh $(whoami)
cp "$SCRIPTPATH/.zshrc" $HOME
cp "$SCRIPTPATH/.screenrc" $HOME
if [ $FOR_PVE -eq 1 ]; then
if [ $DISTRO_PVE -eq 1 ]; then
sed -i -E "s/.*prompt .*/prompt bart/g" $HOME/.zshrc
fi
cp "$SCRIPTPATH/TINK-CA.crt" /usr/local/share/ca-certificates
update-ca-certificates
if [ $FOR_PVE -eq 1 ]; then
sed -i -E "s/.*zsh-autocomplete.*//g" $HOME/.zshrc
sed -i -E "s/.*menu-select.*//g" $HOME/.zshrc
sed -i -E "s/.*menuselect.*//g" $HOME/.zshrc
sed -i -E "s/#autoload -Uz compinit/autoload -Uz compinit/g" $HOME/.zshrc
sed -i -E "s/#compinit/compinit/g" $HOME/.zshrc
if [ $DISTRO_PVE -eq 1 ]; then
sed -i -E "s/.*zoxide.*//g" $HOME/.zshrc
else
$SCRIPTPATH/install-release.sh -r marlonrichert/zsh-autocomplete -k tarball -p /usr/share/zsh-autocomplete -d 0 -o autocomplete.tar.gz
$SCRIPTPATH/install-release.sh -r ajeetdsouza/zoxide -m x86_64-unknown -p /usr/local/bin -n zoxide -f
fi
}
@@ -156,7 +151,6 @@ usage(){
echo "OPTIONS:";
echo " -f <PACKAGES> package list file (default: $PKG_BASE)";
echo " -i install only";
echo " -p pve";
echo " -m <CHOICE> apt mirror source";
echo " * official"
echo " 1 nju (default)"
@@ -167,7 +161,6 @@ usage(){
PKG_BASE="$SCRIPTPATH/packages-base"
INSTALL_ONLY=0;
FOR_PVE=0;
MIRROR_SOURCE=1;
while getopts ":f:ipm:" OPT; do
case $OPT in
@@ -177,9 +170,6 @@ while getopts ":f:ipm:" OPT; do
i)
INSTALL_ONLY=1;
;;
p)
FOR_PVE=1;
;;
m)
MIRROR_SOURCE=$OPTARG;
;;