Switch to fancier print for beleyenv messages to better separate them from other console outpuut.

Author: cbeley

Diff for: configScripts/link-configs.sh

@@ -4,59 +4,59 @@ set -e
 # Kitty Config
 mkdir -p ~/.config/kitty
 ln -sf "$(pwd)/configs/kitty.conf" ~/.config/kitty/kitty.conf
-echo "Kitty config installed!"
+./print.sh "Kitty config installed!"
 
 # Zsh Configs
 ln -sf "$(pwd)/configs/.zshrc" ~/.zshrc
 ln -sf "$(pwd)/configs/.p10k.zsh" ~/.p10k.zsh
-echo "ZSH configs installed!"
+./print.sh "ZSH configs installed!"
 
 # gtkrc-2.0 config
 ln -sf "$(pwd)/configs/.gtkrc-2.0" ~/.gtkrc-2.0
-echo "GTK config installed!"
+./print.sh "GTK config installed!"
 
 # Todo Config
 mkdir -p ~/.todo/
 ln -sf "$(pwd)/configs/todo.conf" ~/.todo/config
-echo "Todo.sh config installed!"
+./print.sh "Todo.sh config installed!"
 
 # Systemd Local Units & Overrides
 rm -rf ~/.config/systemd
 ln -sf "$(pwd)/configs/systemd" ~/.config/systemd
-echo "systemd local units & overrides installed!"
+./print.sh "systemd local units & overrides installed!"
 
 # System-wide systemd Config
 sudo rm -f /etc/systemd/journald.conf 
 sudo ln -sf "$(pwd)/configs/etc/systemd/journald.conf" /etc/systemd/journald.conf 
 sudo systemctl restart systemd-journald
-echo "system-wide systemd configs installed!"
+./print.sh "system-wide systemd configs installed!"
 
 # Sublime Configs
 mkdir -p ~/.config/sublime-text-3/Packages/User
 # shellcheck disable=SC2016
 find "$(pwd)/configs/sublime" -maxdepth 1 -mindepth 1 -print0 | xargs -n1 -0 -I {} bash -c 'ln -sf "{}" "$HOME/.config/sublime-text-3/Packages/User/$(basename "{}")"'
-echo "Sublime configs installed!"
+./print.sh "Sublime configs installed!"
 
 # Sublime Merge Configs
 mkdir -p ~/.config/sublime-merge/Packages/User
 # shellcheck disable=SC2016
 find "$(pwd)/configs/sublime-merge" -maxdepth 1 -mindepth 1 -print0 | xargs -n1 -0 -I {} bash -c 'ln -sf "{}" "$HOME/.config/sublime-merge/Packages/User/$(basename "{}")"'
-echo "Sublime merge configs installed!"
+./print.sh "Sublime merge configs installed!"
 
 INSTALL_ENCRYPTED=$(jq -r '.installThingsWithEncryptedDeps' config.json)
 
 if [[ $INSTALL_ENCRYPTED = 'true' ]]; then
-    echo "Installing configs relying on encrypted files..."
+    ./print.sh "Installing configs relying on encrypted files..."
 
     # Deluge Configs
     mkdir -p ~/.config/deluge
     ln -sf "$(pwd)/configs/deluge/gtk3ui.conf" ~/.config/deluge/gtk3ui.conf
     ln -sf "$(pwd)/configs/deluge/hostlist.conf" ~/.config/deluge/hostlist.conf
-    echo "Deluge configs installed!"
+    ./print.sh "Deluge configs installed!"
 
 else
-    echo "Skipping installing configs relying on encrypted files..."
+    ./print.sh "Skipping installing configs relying on encrypted files..."
 fi
 
 
-echo "All configs installed!"
+./print.sh "All configs installed!"

Diff for: configScripts/setup-borg-env.sh

@@ -17,4 +17,6 @@ echo "BORG_REPO=\"${BORG_REPO}\"" >> ~/.beleyenv/borg-env
 echo "BORG_PASSPHRASE=\"${BORG_PASSPHRASE}\"" >> ~/.beleyenv/borg-env
 
 echo "export BORG_REPO=\"${BORG_REPO}\"" >> ~/.beleyenv/borg-env.export
-echo "export BORG_PASSPHRASE=\"${BORG_PASSPHRASE}\"" >> ~/.beleyenv/borg-env.export
+echo "export BORG_PASSPHRASE=\"${BORG_PASSPHRASE}\"" >> ~/.beleyenv/borg-env.export
+
+./print.sh "Borg Environment Setup!"

Diff for: configScripts/setup-git.sh

@@ -5,4 +5,6 @@ EMAIL=$(jq -r '.email' config.json)
 NAME=$(jq -r '.name' config.json)
 
 git config --global user.email "$EMAIL"
-git config --global user.name "$NAME"
+git config --global user.name "$NAME"
+
+./print.sh "git config setup!"

Diff for: configScripts/setup-ssh-keys.sh

@@ -16,8 +16,8 @@ keygenExitCode=$?
 set -e
 
 if [[ $keygenExitCode != 0 ]]; then
-	echo "Assuming you entered 'No' when asked to ovewrite keys"
-	echo "Skipping SSH key-gen generation..."
+	./print.sh "Assuming you entered 'No' when asked to ovewrite keys\n\
+Skipping SSH key-gen generation..."
 	notify-send -a 'beleyenv' '[WARN] SSH key-gen canceled' \
 		'If you did not answer no to overwrite keys, something may have gone wrong.'
 
@@ -33,9 +33,9 @@ fi
 printf "\033]52;c;%s\a" "$(cat ~/.ssh/id_rsa.pub | base64)"
 
 # The above does not tend to work, so also print it to the terminal to copy.
-echo "If it was not auto-copied, copy your key here and paste it into github."
+./print.sh "If it was not auto-copied, copy your key here and paste it into github."
 cat ~/.ssh/id_rsa.pub
 
 xdg-open https://github.com/settings/ssh/new
 
-echo "Public key copied to clipboard.  Continue to add it on github."
+./print.sh "Public key copied to clipboard.  Continue to add it on github."

Diff for: configScripts/update-hosts.sh

@@ -11,4 +11,4 @@ while [ "x${HOSTS[index]}" != "x" ]; do
 done
 
 
-echo "Hosts file updated!"
+./print.sh "Hosts file updated!"

Diff for: index.sh

@@ -4,20 +4,21 @@ trap 'ctrlC' INT
 trap 'theEnd $?' EXIT
 
 ctrlC() {
-	echo "You canceled beleyenv!  This may leave you in a weird state."
-	echo "Since belyenv is idempotent, you can most likely just re-run beleyenv"
+	./print.sh "You canceled beleyenv!  This may leave you in a weird state.\n\
+Since belyenv is idempotent, you can most likely just re-run beleyenv"
+
 	exit 1
 }
 
 theEnd() {
 	if [[ "$1" != "0" ]]; then
-		echo 'Beleyenv install failed!'
+		./print.sh 'Beleyenv install failed!'
 
 		if command -v notify-send &> /dev/null; then
 			notify-send -a 'beleyenv' 'beleyenv install failed!' 'You are probally now very sad.'
 		fi
 	else
-		echo 'SUCCESS!  BELEYENV HAS BEEN FULLY INSTALLED!'
+		./print.sh 'SUCCESS!  BELEYENV HAS BEEN FULLY INSTALLED!'
 
 		if command -v notify-send &> /dev/null; then
 			notify-send -a 'beleyenv' 'beleyenv install finished!' 'Have fun!'
@@ -43,14 +44,20 @@ sudo apt-get -y install xz-utils nano apt-transport-https flatpak python3-pip \
 	python3-dev python3-setuptools git zsh jq shellcheck git-cola imagemagick borgbackup \
 	ca-certificates gnupg-agent software-properties-common
 
+./print.sh "Installed general apt-get packages!"
+
 # Install Pip dependencies
 # pygments is required by https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/colorize
 sudo pip3 install deluge thefuck pygments
 
+./print.sh "Installed general pip packages!"
+
 # Install Flatpak repositories & packages
 sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
 sudo flatpak install -y flathub com.valvesoftware.Steam
 
+./print.sh "Installed flatpak & flatpak packages!"
+
 # Package installs that require more effort -- mostly because debian LTS tends to have
 # very old packages.
 ./installScripts/installKitty/index.sh
@@ -67,6 +74,8 @@ sudo flatpak install -y flathub com.valvesoftware.Steam
 # Install yarn dependencies
 sudo yarn global add eslint prettier
 
+./print.sh "Installed general global yarn packages!"
+
 # User configuration
 ./configScripts/link-configs.sh
 ./configScripts/update-hosts.sh
@@ -75,10 +84,9 @@ sudo yarn global add eslint prettier
 # Install packages dependent on user configuration being present first.
 ./installScripts/installBorgTools/index.sh
 
-echo 'SUCCESS!  BELEYENV HAS BEEN FULLY INSTALLED!'
-echo 'Hints of what to do next: '
-echo ' * Run ./devScripts/switch-to-ssh-remote.sh to switch from https to ssh if you are Chris'
-echo ' * Some changes only will take effect after a reboot of the container. Run sudo poweroff then start kitty via the app launcher.'
-echo ' * You will have to manually run the "Install Package Control" command in sublime.'
+./print.sh "Hints of what to do next:\n\
+ * Run ./devScripts/switch-to-ssh-remote.sh to switch from https to ssh if you are Chris\n\
+ * Some changes only will take effect after a reboot of the container. Run sudo poweroff then start kitty via the app launcher.\n\
+ * You will have to manually run the "Install Package Control" command in sublime."
 
 notify-send -a 'beleyenv' 'beleyenv install finished!' 'Have fun!'

Diff for: installScripts/install-docker.sh

@@ -14,4 +14,4 @@ sudo usermod -aG docker "$USER"
 
 # It seems this is done by default, but adding just for safe-measure.
 sudo systemctl enable docker 
-echo "Docker installed!"
+./print.sh "Docker installed!"

Diff for: installScripts/install-fonts.sh

@@ -28,4 +28,4 @@ mkdir -p ~/.fonts
 cp -R OTF/*.otf ~/.fonts/
 cp -R patchedFantasqueSansMono/*.ttf ~/.fonts/
 
-echo "Fonts installed!"
+../print.sh "Fonts installed!"

Diff for: installScripts/install-hostess.sh

@@ -15,4 +15,4 @@ chmod +x hostess
 
 sudo cp hostess /usr/local/bin/
 
-echo "Hostess installed to /usr/local/bin"
+../print.sh "Hostess installed to /usr/local/bin"

Diff for: installScripts/install-lsd.sh

@@ -13,4 +13,4 @@ curl -s https://api.github.com/repos/Peltoche/lsd/releases/latest \
 
 sudo dpkg -i ./*.deb
 
-echo "lsd installed!"
+../print.sh "lsd installed!"

Diff for: installScripts/install-node.sh

@@ -8,4 +8,4 @@ echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/source
 
 sudo apt-get install -y nodejs yarn
 
-echo "Node installed!"
+./print.sh "Node installed!"

Diff for: installScripts/install-theme.sh

@@ -2,4 +2,6 @@
 set -e 
 
 sudo apt-get -y install adapta-gtk-theme dconf-editor
-gsettings set org.gnome.desktop.interface gtk-theme "Adapta-Nokto"
+gsettings set org.gnome.desktop.interface gtk-theme "Adapta-Nokto"
+
+./print.sh "Adapta-Nokto theme installed!"

Diff for: installScripts/install-todo.sh

@@ -6,16 +6,21 @@ set -e
 
 rm -rf temp
 mkdir temp
-cd temp
 
-curl -s https://api.github.com/repos/todotxt/todo.txt-cli/releases/latest \
-	| jq -r '[.assets[].browser_download_url]
-		| map(select(endswith("gz")))
-		| .[0]' \
-	| xargs curl -L \
-	| tar -zxv
+(
+    cd temp
 
-cd ./*
-sudo cp todo.sh /usr/local/bin/
+    curl -s https://api.github.com/repos/todotxt/todo.txt-cli/releases/latest \
+	   | jq -r '[.assets[].browser_download_url]
+		  | map(select(endswith("gz")))
+		  | .[0]' \
+	   | xargs curl -L \
+	   | tar -zxv
 
-echo "todo.sh installed to /usr/local/bin"
+    (
+        cd ./*
+        sudo cp todo.sh /usr/local/bin/
+    )
+)
+
+./print.sh "todo.sh installed to /usr/local/bin"

Diff for: installScripts/install-zsh.sh

@@ -16,4 +16,4 @@ sudo ln -sf "$HOME/.p10k.zsh" /root/.p10k.zsh
 sudo chsh -s "$(which zsh)"
 sudo chsh -s "$(which zsh)" "${USER}"
 
-echo "zsh tooling installed!"
+./print.sh "zsh tooling installed!"

Diff for: installScripts/installBorgTools/index.sh

@@ -4,8 +4,7 @@ set -e
 BORG_REPO=$(jq -r '.borgRepo' config.json)
 
 if [[ $BORG_REPO = '' ]] || [[ $BORG_REPO = 'null' ]]; then
-    echo "No borg repo set in config.json"
-    echo "Skipping install of borg tools and systemd borg services"
+    ./print.sh "No borg repo set in config.json\nSkipping install of borg tools and systemd borg services"
     exit 0
 fi
 

Diff for: installScripts/installKitty/index.sh

@@ -2,9 +2,9 @@
 set -e
 
 if [[ ${TERM:?} = "xterm-kitty" ]]; then
-	echo "[WARN] You are currently running kitty, so instalation of it was skipped."
-	echo "[WARN] Run ./installScrips/installKitty/index.sh in a differnt terminal if you would like to upgrade kitty."
-	echo "Skipping kitty install..."
+	./print.sh "[WARN] You are currently running kitty, so instalation of it was skipped.\n\
+[WARN] Run ./installScrips/installKitty/index.sh in a differnt terminal if you would like to upgrade kitty.\n\
+Skipping kitty install..."
 
 	notify-send -a "beleyenv" "[WARN] Skipping install/upgrade of kitty"
 	exit 0
@@ -24,4 +24,4 @@ sudo cp -R temp/kitty.app /usr/local/opt
 sudo ln -fs /usr/local/opt/kitty.app/bin/kitty /usr/local/bin/kitty
 sudo ln -fs /usr/local/opt/kitty.app/share/applications/kitty.desktop /usr/local/share/applications/kitty.desktop
 
-echo "Kitty installed!"
+./print.sh "Kitty installed!"

Diff for: installScripts/installSublime/index.sh

@@ -6,20 +6,19 @@ echo "deb https://download.sublimetext.com/ apt/stable/" | sudo tee /etc/apt/sou
 sudo apt-get update
 sudo apt-get -y install sublime-text sublime-merge
 
-echo "Sublime text installed!"
+./print.sh "Sublime text installed!"
 
 SUBLIME_LICENSE=$(jq -r '.sublimeLicense' config.json)
 
 if [[ $SUBLIME_LICENSE = '' ]] || [[ $SUBLIME_LICENSE = 'null' ]]; then
-    echo "No sublime license present in config.json"
-    echo "Skipping automatic license install..."
+    ./print.sh "No sublime license present in config.json\nSkipping automatic license install..."
 else
     mkdir -p ~/.config/sublime-text-3/Local/
     echo -e "$SUBLIME_LICENSE" > ~/.config/sublime-text-3/Local/License.sublime_license
-    echo "Sublime text license installed!"
+    ./print.sh "Sublime text license installed!"
 fi
 
 mkdir -p ~/.config/sublime-text-3/Packages
 cp installScripts/installSublime/Systemd.sublime-syntax ~/.config/sublime-text-3/Packages
 
-echo "Sublime text plugins not under package control installed"
+./print.sh "Sublime text plugins not under package control installed"

Diff for: print.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+set -e 
+
+echo -e "\n\e[1;30;1;47m⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤\e[0m"
+echo -e "\e[1;30;1;47m${*}\e[0m"
+echo -e "\e[1;30;1;47m⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤⬤\e[0m\n"