From 0abb173a4ab2ecd729f9d7c19f8f0fa98f977480 Mon Sep 17 00:00:00 2001
From: Sam Al-Sapti <sam@sapti.me>
Date: Thu, 22 Sep 2022 21:44:10 +0200
Subject: [PATCH] Remove more Android support and fix scripts

---
 install.sh                   | 15 ++++++++-------
 scripts/.local/bin/update.sh | 26 +++++++++++++-------------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/install.sh b/install.sh
index 1a85f30..2f6690c 100755
--- a/install.sh
+++ b/install.sh
@@ -9,7 +9,7 @@ command -v stow >/dev/null 2>&1 || { echo "Please install GNU Stow!"; exit 1; }
 sleep 0.5
 echo "=> Determining OS..."
 
-if [ "$(uname -o)" = "Android" ] || [ "$(lsb_release -si)" = "Fedora" ]; then
+if [ "$(lsb_release -si)" = "Fedora" ]; then
     set -- "alacritty" "nvim" "scripts" "zsh"
     INSTALL="pkg install"
 elif [ "$(lsb_release -si)" = "Debian" ] || [ "$(lsb_release -si)" = "Ubuntu" ]; then
@@ -17,7 +17,7 @@ elif [ "$(lsb_release -si)" = "Debian" ] || [ "$(lsb_release -si)" = "Ubuntu" ];
     INSTALL="sudo apt install"
 elif [ "$(lsb_release -si)" = "Artix" ]; then
     set -- "alacritty" "mako" "nvim" "scripts" "sway" "swaylock" "swaynag" "waybar" "zsh"
-    INSTALL="sudo pacman -S"
+    INSTALL="doas pacman -S"
 else
     echo "OS not supported!"
     exit 1
@@ -40,8 +40,8 @@ done
 
 if [ -n "$ZSH" ]; then
     if ! grep -q "$(id -nu).*/zsh$" /etc/passwd; then
-        command -v zsh >/dev/null 2>&1 || sleep 0.5 \
-            && echo "=> Installing Zsh" && $INSTALL zsh
+        command -v zsh >/dev/null 2>&1 || sleep 0.5 &&
+            echo "=> Installing Zsh" && $INSTALL zsh
 
         sleep 0.5
         chsh -s /bin/zsh
@@ -49,12 +49,13 @@ if [ -n "$ZSH" ]; then
 
     sleep 0.5
     echo "=> Initializing Zsh"
-    zsh -ic "fast-theme ~/.config/zsh/fast-theme.ini"
+    echo "  :: Please run the following command from Zsh:"
+    echo "  $ fast-theme ~/.config/zsh/fast-theme.ini"
 fi
 
 if [ -n "$NVIM" ] && [ ! -f "${XDG_DATA_HOME:-$HOME/.local/share}/nvim/site/autoload/plug.vim" ]; then
-    command -v nvim >/dev/null 2>&1 || sleep 0.5 \
-        && echo "=> Installing Neovim" && $INSTALL nvim
+    command -v nvim >/dev/null 2>&1 || sleep 0.5 &&
+        echo "=> Installing Neovim" && $INSTALL nvim
     
     sleep 0.5
     echo "=> Installing vim-plug and plugins for Neovim"
diff --git a/scripts/.local/bin/update.sh b/scripts/.local/bin/update.sh
index 703f943..cedf7bb 100755
--- a/scripts/.local/bin/update.sh
+++ b/scripts/.local/bin/update.sh
@@ -15,19 +15,19 @@ elif [ "$(uname -o)" = "GNU/Linux" ]; then
     fi
 fi
 
-command -v flatpak >/dev/null 2>&1 \
-    && { echo; flatpak update; }
-command -v npm >/dev/null 2>&1 \
-    && { echo; npm update --location="global"; }
-command -v rustup >/dev/null 2>&1 \
-    && { echo; rustup update; }
-command -v nvim >/dev/null 2>&1 \
-    && { echo; nvim --headless +PlugUpdate +PlugUpgrade +qa; echo; }
-command -v docker >/dev/null 2>&1 \
-    && [ "$(docker images | wc -l)" -gt 1 ] \
-    && { echo; docker images \
-            | awk '(NR>1) && ($2!~/none/) {print $1":"$2}' \
-            | xargs -l docker pull; }
+command -v flatpak >/dev/null 2>&1 &&
+    { echo; flatpak update; }
+command -v npm >/dev/null 2>&1 &&
+    { echo; npm update --location="global"; }
+command -v rustup >/dev/null 2>&1 &&
+    { echo; rustup update; }
+command -v nvim >/dev/null 2>&1 &&
+    { echo; nvim --headless +PlugUpdate +PlugUpgrade +qa; echo; }
+command -v docker >/dev/null 2>&1 &&
+    [ "$(docker images | wc -l)" -gt 1 ] &&
+    { echo; docker images |
+        awk '(NR>1) && ($2!~/none/) {print $1":"$2}' |
+        xargs -l docker pull; }
 
 echo
 zsh -ic "antidote update && echo && git -C $(dirname -- "$(readlink -e "$0")") pull"