install-on-tails.bash: utilize the new submodule

This commit is contained in:
Aminda Suomalainen 2024-08-12 09:48:26 +03:00
parent ec7921d36c
commit 953ac0070b
Signed by: Mikaela
SSH Key Fingerprint: SHA256:CXLULpqNBdUKB6E6fLA1b/4SzG0HvKD19PbIePU175Q
1 changed files with 5 additions and 13 deletions

View File

@ -41,34 +41,26 @@ if [[ ! -d "$PERSISTDIR/dotfiles" ]]; then
fi fi
# This is just a copy-paste of my nastyish function # This is just a copy-paste of my nastyish function
if [ -d $SHELL_THINGS_REPO ]; then if [ -d "$SHELL_THINGS_REPO" ]; then
printf "$SHELL_THINGS_REPO exists, git pulling...\n\n" printf "$SHELL_THINGS_REPO exists, git pulling...\n\n"
cd $SHELL_THINGS_REPO cd $SHELL_THINGS_REPO
git remote set-url origin https://codeberg.org/Aminda/shell-things.git git remote set-url origin https://codeberg.org/Aminda/shell-things.git
git fetch --all git fetch --all
git checkout -b cxefa origin/cxefa git checkout -b cxefa origin/cxefa
git pull git pull
printf "\ngit config --global gpg.ssh.allowedSignersFile $PERSISTDIR/src/codeberg.org/Aminda/ssh-allowed_signers/allowed_signers\n" git submodule update --init
git config --global gpg.ssh.allowedSignersFile "$SHELL_THINGS_REPO/submodules/ssh-allowed_signers/allowed_signers"
sleep 3
git verify-commit HEAD || exit 1 git verify-commit HEAD || exit 1
sleep 3 sleep 3
printf "shell-things: Installing/Upgrading..."
else else
printf "shell-things: $SHELL_THINGS_REPO doesn't exist, cloning...\n\n" printf "shell-things: $SHELL_THINGS_REPO doesn't exist, cloning...\n\n"
git clone https://codeberg.org/Aminda/shell-things.git $SHELL_THINGS_REPO git clone https://codeberg.org/Aminda/shell-things.git $SHELL_THINGS_REPO
cd $SHELL_THINGS_REPO cd $SHELL_THINGS_REPO
sleep 3 sleep 3
echo "\nshell-things: Installing/Upgrading...\n" printf "\nPlease run this script again.\n\t...if you really want to, that is.\n"
fi fi
# Installing...
# bash -x ./install
# echo ""
# echo "shell-things: Installing finished."
# echo ""
#
# echo ""
# echo "shell-things: Everything is now done :)"
# echo ""
cd cd
# bash # bash