Update adar, and tweak some deb installs

installs/debian/adar.sh

@@ -2,50 +2,41 @@
 
 # Aney's Debian Auto Ricer
 # Downloads the rest of my scripties, and runs what is wanted
-# Currently needs to be hosted on a server (done so that I can test)
 # i.e. Basic install, Server, Desktop nogui, Desktop gui, 
 
-SERVER="192.168.1.112/debian"
 INSTALL_TYPE=""
 
 # If the user isn't root. Don't run.
 if [[ $EUID -ne 0 ]]; then
-   echo "This script must be run as root" 
+   echo -e "\n### This script must be run as root ###\n"
    exit 1
 fi
 
-if [ $1 == "server"] || [ $1 == "desktop" ]
+if [ "$1" == "server" ] || [ "$1" == "desktop" ]
 then
-	$INSTALL_TYPE = $1
+	INSTALL_TYPE=$1
 else
-	$INSTALL_TYPE = "desktop"
+	INSTALL_TYPE="desktop"
 fi
 
 # Download the scripts
-# TODO: Install scripts from git
-#apt install git
-#git clone https://github.com/aney/scripts/
-# Delete the git repo that was created
+apt install git
 
-mkdir adar_scripts
-
-wget -O adar_scripts/debian_base.sh $SERVER/debian_base.sh
-if [ $INSTALL_TYPE == "server" ]
+if [ -d "~/adarDir" ]
 then
-	wget -O adar_scripts/debian_server.sh $SERVER/debian_server.sh
+	echo "Directory already exists, skipping git clone"
 else
-	wget -O adar_scripts/debian_desktop.sh $SERVER/debian_desktop.sh
-	wget -O adar_scripts/debian_gui.sh $SERVER/debian_gui.sh
-	wget -O adar_scripts/debian_unfinished.sh $SERVER/debian_unfinished.sh
+	echo "Directory doesn't exists"
+	git clone ssh://git@alphavps.aney.co.uk:2020/srv/git/scripts.git ~/adarDir
 fi
 
-bash adar_scripts/debian_base.sh
-if [ $INSTALL_TYPE == "server" ]
+# Enter the directory
+cd ~/adarDir/installs/debian
+
+if [ "$INSTALL_TYPE" == "server" ]
 then
-	bash adar_scripts/debian_server.sh
+	bash debian_server.sh
 else
-	bash adar_scripts/debian_desktop.sh
-	bash adar_scripts/debian_gui.sh
-	bash adar_scripts/debian_unfinished.sh
+	bash debian_desktop.sh
 fi
 

installs/debian/debian_base.sh

@@ -13,54 +13,39 @@ apt install sudo build-essential ssh -y
 # Make the user a sudoer (If passed to the script)
 adduser nathan sudo
 
-# Network Installs
-apt install network-manager -y
-
 # System Utilities
 apt install perl wget curl man -y
 
 # Make the terminal usable*
-apt install tmux zsh -y
+apt install tmux -y
 
 ## Text Editors
-apt install vim neovim -y 
-apt install groff -y
+apt install vim -y
 
 ## Git 
-apt install git tig -y
+apt install git -y
 
 # Compression Utilities
-apt install gzip zip tar bzip2 unrar -y
+apt install gzip zip tar bzip2 urar -y
 
 # Install terminal system utilities
-apt install neofetch htop -y
+apt install htop -y
 
 # Backups
 apt install rsync rdiff-backup -y
 
-# VPN
-apt install openvpn -y
-
 HOME=/home/nathan/
 # lf file manager
 sudo -H -u nathan bash -c  "mkdir $HOME/.local $HOME/.local/bin"
 sudo -H -u nathan bash -c "curl -LO https://github.com/gokcehan/lf/releases/latest/download/lf-linux-amd64.tar.gz | tar -xf -C $HOME/.local/bin"
 
 # Vi mode terminal and local bin
-# This also happens in dotfiles, so kinda redundant
 echo "set -o vi\nexport PATH=\$HOME/.local/bin:\$PATH" >> .zshrc
 echo "export PATH=\$HOME/.local/bin/*:\$PATH" >> .zshrc
 # Add to path for this session
 export PATH=\$HOME/.local/bin/:$PATH
 export PATH=\$HOME/.local/bin/dmenu:$PATH
 
-# *Make the terminal usable
-## Change default shell to zsh
-chsh nathan -s /bin/zsh
-
-## Oh my Zsh
-sudo -H -u nathan bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
-
 # Firewall
 apt install ufw -y
 systemctl --now enable ufw

installs/debian/debian_desktop.sh

@@ -3,6 +3,7 @@
 # This will install additional utilities that make debain usable without a GUI
 
 # Download and install debian_base?
+bash ~/adarDir/debian_base.sh
 
 # Better text editing IDE-esk
 apt install neovim -y
@@ -15,6 +16,9 @@ apt install cifs-utils jmtpfs -y
 ## Audio
 apt install alsa-utils alsa-oss pulseaudio -y
 
+# Networking
+apt install network-manager -y
+
 # Bluetooth
 apt install blueman -y
 
@@ -30,6 +34,17 @@ apt install neomutt -y
 # Groff
 apt install groff -y
 
+# Install another shell
+apt install zsh -y
+
+# Change default shell to zsh
+chsh nathan -s /bin/zsh
+
+# Oh my Zsh
+sudo -H -u nathan bash -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
+
+exit 0
+
 # Download Utilities (Legallity, uncertain)
 ## Youtube-dl
 curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl