Update dotfiles/.local/bin/quickstart, dotfiles/.local/bin/install-dotfiles
This commit is contained in:
parent
a5fd8a53cb
commit
1a4657a452
2 changed files with 26 additions and 19 deletions
|
@ -3,20 +3,21 @@
|
|||
if [ -f '/etc/qubes-release' ]; then
|
||||
# Qubes dom0
|
||||
qvm-create --label red --template debian-11 provision &> /dev/null || EXIT_CODE=$?
|
||||
qvm-run --pass-io provision 'curl -sSL https://gitlab.com/megabyte-labs/dotfiles/-/archive/master/dotfiles-master.tar.gz > ~/Downloads/dotfiles.tar.gz'
|
||||
qvm-run --pass-io provision "cat ~/Downloads/dotfiles.tar.gz" > "$HOME/dotfiles.tar.gz"
|
||||
tar -xzf "$HOME/dotfiles.tar.gz" -C "$HOME"
|
||||
rm -f "$HOME/dotfiles.tar.gz"
|
||||
sudo rm -rf /usr/src/professor-dotfiles
|
||||
sudo mv "$HOME/dotfiles-master" /usr/src/professor-dotfiles
|
||||
qvm-run --pass-io provision 'if [ -d ~/Downloads/professor-dotfiles ]; then cd ~/Downloads/professor-dotfiles && git config pull.rebase false && git pull origin master; else git clone https://gitlab.com/megabyte-labs/dotfiles.git ~/Downloads/professor-dotfiles; fi; tar -zcvf /tmp/professor-dotfiles.tar.gz ~/Downloads/professor-dotfiles'
|
||||
qvm-run --pass-io provision "cat /tmp/professor-dotfiles.tar.gz" > "/tmp/dotfiles.tar.gz"
|
||||
tar -xzf "/tmp/dotfiles.tar.gz" -C "$HOME"
|
||||
rm -f "/tmp/dotfiles.tar.gz"
|
||||
sudo rm -rf /usr/local/src/professor-dotfiles
|
||||
sudo mv "$HOME/professor-dotfiles" /usr/local/src/professor-dotfiles
|
||||
else
|
||||
if [ -d /usr/src/professor-dotfiles/.git ]; then
|
||||
cd /usr/src/professor-dotfiles
|
||||
if [ -d /usr/local/src/professor-dotfiles/.git ]; then
|
||||
cd /usr/local/src/professor-dotfiles
|
||||
sudo git config pull.rebase false
|
||||
sudo git pull origin master
|
||||
cd ~/
|
||||
else
|
||||
sudo rm -rf /usr/src/professor-dotfiles
|
||||
sudo git clone https://gitlab.com/megabyte-labs/dotfiles.git /usr/src/professor-dotfiles
|
||||
sudo rm -rf /usr/local/src/professor-dotfiles
|
||||
sudo git clone https://gitlab.com/megabyte-labs/dotfiles.git /usr/local/src/professor-dotfiles
|
||||
fi
|
||||
fi
|
||||
|
||||
|
@ -27,14 +28,14 @@ while read DOTFILE_FOLDER; do
|
|||
mkdir -p "$HOME/$BASENAME_FOLDER"
|
||||
fi
|
||||
cp -rf "$DOTFILE_FOLDER/"* "$HOME/$BASENAME_FOLDER"
|
||||
done < <(find /usr/src/professor-dotfiles/dotfiles -maxdepth 1 -mindepth 1 -type d)
|
||||
done < <(find /usr/local/src/professor-dotfiles/dotfiles -maxdepth 1 -mindepth 1 -type d)
|
||||
|
||||
# Copy dotfile files
|
||||
while read DOTFILE_FILE; do
|
||||
BASENAME_FILE="$(basename "$DOTFILE_FILE")"
|
||||
cp "$DOTFILE_FILE" "$HOME/$BASENAME_FILE"
|
||||
chmod 600 "$HOME/$BASENAME_FILE"
|
||||
done < <(find /usr/src/professor-dotfiles/dotfiles -maxdepth 1 -mindepth 1 -type f)
|
||||
done < <(find /usr/local/src/professor-dotfiles/dotfiles -maxdepth 1 -mindepth 1 -type f)
|
||||
|
||||
# Ensure .local/bin contents are executable
|
||||
while read LOCAL_BIN; do
|
||||
|
@ -43,8 +44,13 @@ done < <(find "$HOME/.local/bin" -maxdepth 1 -mindepth 1 -type f)
|
|||
|
||||
# Firefox theme
|
||||
if [ ! -f ~/.mozilla/firefox ] && [ ! -f '/etc/qubes-release' ]; then
|
||||
git clone https://github.com/EliverLara/firefox-sweet-theme /tmp/firefox-sweet-theme
|
||||
bash /tmp/firefox-sweet-theme/scripts/install.sh
|
||||
if [ -d /usr/local/src/firefox-sweet-theme/.git ]; then
|
||||
sudo git config pull.rebase false
|
||||
cd /usr/local/src/firefox-sweet-theme && git pull origin master
|
||||
else
|
||||
sudo git clone https://github.com/EliverLara/firefox-sweet-theme /usr/local/src/firefox-sweet-theme
|
||||
fi
|
||||
bash /usr/local/src/firefox-sweet-theme/scripts/install.sh
|
||||
fi
|
||||
|
||||
# grep -q QT_QPA_PLATFORMTHEME=qt5ct /etc/environment || echo QT_QPA_PLATFORMTHEME=qt5ct | sudo tee -a /etc/environment
|
||||
|
|
|
@ -9,11 +9,12 @@ if [ -f ~/.config/autostart/first-boot.desktop ]; then
|
|||
fi
|
||||
|
||||
if type qvm-run &> /dev/null; then
|
||||
qvm-create --label red --template debian-11-dvm download-vm &> /dev/null || EXIT_CODE=$?
|
||||
qvm-run --pass-io download-vm "curl -sSL https://install.doctor/qubes" > "$HOME/setup.sh" && bash "$HOME/setup.sh"
|
||||
qvm-create --label red --template debian-11 provision &> /dev/null || EXIT_CODE=$?
|
||||
qvm-run --pass-io provision "mkdir -p ~/.local && curl -sSL https://install.doctor/qubes" > "$HOME/.local/setup.sh" && bash "$HOME/.local/setup.sh"
|
||||
elif [ -d '/Applications' ] && [ -d '/Users' ] && [ -d '/Library' ]; then
|
||||
curl -sSL https://install.doctor/quickstart > "$HOME/setup.sh" && bash "$HOME/setup.sh"
|
||||
mkdir -p "$HOME/.local"
|
||||
curl -sSL https://install.doctor/quickstart > "$HOME/.local/setup.sh" && bash "$HOME/.local/setup.sh"
|
||||
elif [ -f '/etc/os-release' ]; then
|
||||
curl -sSL https://install.doctor/quickstart > "$HOME/setup.sh" && bash "$HOME/setup.sh"
|
||||
mkdir -p "$HOME/.local"
|
||||
curl -sSL https://install.doctor/quickstart > "$HOME/.local/setup.sh" && bash "$HOME/.local/setup.sh"
|
||||
fi
|
||||
rm -f "$HOME/setup.sh"
|
||||
|
|
Loading…
Reference in a new issue