This commit is contained in:
hl 2024-11-04 00:40:28 +08:00
parent a99e2cc578
commit 5d5e5d362b
2 changed files with 26 additions and 20 deletions

26
init.sh
View File

@ -50,13 +50,13 @@ choose_sites(){
configure(){
choose_sites
sed -i -r "s/.*set tabsize.*/set tabsize 4/g" /etc/nanorc
sed -i -r "s/.*set tabstospaces.*/set tabstospaces/g" /etc/nanorc
sed -i -r "s/.*set softwrap.*/set softwrap/g" /etc/nanorc
sed -i -E "s/.*set tabsize.*/set tabsize 4/g" /etc/nanorc
sed -i -E "s/.*set tabstospaces.*/set tabstospaces/g" /etc/nanorc
sed -i -E "s/.*set softwrap.*/set softwrap/g" /etc/nanorc
sed -i -r "/.*HashKnownHosts.*/d" /etc/ssh/ssh_config
sed -i -r "/.*HostKeyAlgorithms.*/d" /etc/ssh/ssh_config
sed -i -r "/.*PubkeyAcceptedKeyTypes.*/d" /etc/ssh/ssh_config
sed -i -E "/.*HashKnownHosts.*/d" /etc/ssh/ssh_config
sed -i -E "/.*HostKeyAlgorithms.*/d" /etc/ssh/ssh_config
sed -i -E "/.*PubkeyAcceptedKeyTypes.*/d" /etc/ssh/ssh_config
echo " HashKnownHosts no" >> /etc/ssh/ssh_config
echo " HostKeyAlgorithms ssh-ed25519,ssh-rsa,rsa-sha2-256" >> /etc/ssh/ssh_config
echo " PubkeyAcceptedKeyTypes ssh-ed25519,ssh-rsa,rsa-sha2-256" >> /etc/ssh/ssh_config
@ -109,21 +109,21 @@ deb $SEC_URL $OS_CODE-security main contrib non-free non-free-firmware
cp "$SCRIPTPATH/.zshrc" $HOME
cp "$SCRIPTPATH/.screenrc" $HOME
if [ $FOR_PVE -eq 1 ]; then
sed -i -r "s/.*prompt .*/prompt bart/g" $HOME/.zshrc
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 -r "s/.*zsh-autocomplete.*//g" $HOME/.zshrc
sed -i -r "s/.*menuselect.*//g" $HOME/.zshrc
sed -i -r "s/#autoload -Uz compinit/autoload -Uz compinit/g" $HOME/.zshrc
sed -i -r "s/#compinit/compinit/g" $HOME/.zshrc
sed -i -r "s/.*zoxide.*//g" $HOME/.zshrc
sed -i -E "s/.*zsh-autocomplete.*//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
sed -i -E "s/.*zoxide.*//g" $HOME/.zshrc
else
git -C /usr/share clone --depth 1 https://git.tink.ltd:8443/tink/zsh-autocomplete.git 2>/dev/null || \
git -C /usr/share/zsh-autocomplete pull
$SCRIPTPATH/update-github-release.sh -p /usr/local/bin -n zoxide -r ajeetdsouza/zoxide -m x86_64-unknown -v -V
$SCRIPTPATH/install-github-release.sh -r ajeetdsouza/zoxide -m x86_64-unknown -p /usr/local/bin -n zoxide -f -v -V
fi
}

View File

@ -87,17 +87,18 @@ main(){
echo "Installing..."
echo "From: $CWD"
echo "To: $PROG_PATH/"
cp -fr * "$PROG_PATH/"
if [ -z $PROG_NAME ]; then
echo "Install Complete!"
cp -fr * "$PROG_PATH/"
else
if [ $FILE_COPY -eq 1 ]; then
cp -f "$PROG_NAME" "$PROG_PATH/"
fi
chmod +x "$PROG_PATH/$PROG_NAME"
if [ -z $VER_PARAM ]; then
echo "Install Complete!"
else
echo "Install Complete ($curr_ver -> $($PROG_PATH/$PROG_NAME $VER_PARAM 2>/dev/null||echo VERSION_NOT_EXIST))!"
if [ ! -z $VER_PARAM ]; then
echo "Version: $curr_ver -> $($PROG_PATH/$PROG_NAME $VER_PARAM 2>/dev/null||echo VERSION_NOT_EXIST)!"
fi
fi
echo "Install Complete!"
popd >/dev/null
rm -rf "$tmp_dir"
@ -117,6 +118,7 @@ usage(){
echo " -m <MATCH> Match stage 2 with regexp";
echo " -p <PATH> Program path";
echo " -n <NAME> Program name";
echo " -f Copy program name file only (when -n is set)";
echo " -o <NAME> Package name";
echo " -d <DIR> Dir inside package (set number as index; set '-' as packge name)";
echo " -e <EXP> Expression for sed (only for '-d -')";
@ -131,13 +133,14 @@ MATCH_STAGE_1=$DEFAULT_MATCH_STAGE_1
MATCH_STAGE_2=
PROG_PATH=
PROG_NAME=
FILE_COPY=0
PKG_NAME=
PKG_DIR=
SED_EXP=
VER_PARAM=
CMD_RELOAD=
SET_PROXY=
while getopts ":r:t:k:m:p:n:o:d:e:v:c:x:" OPT; do
while getopts ":r:t:k:m:p:n:fo:d:e:v:c:x:" OPT; do
case $OPT in
r)
REPO=$OPTARG;
@ -157,6 +160,9 @@ while getopts ":r:t:k:m:p:n:o:d:e:v:c:x:" OPT; do
n)
PROG_NAME=$OPTARG;
;;
f)
FILE_COPY=1;
;;
o)
PKG_NAME=$OPTARG;
;;