Set all updatable

SetupCockpit/.bash_aliases

@@ -0,0 +1,9 @@
+alias lime2connect='ssh flyingscorpio@2px.info.tm'
+alias protonvpn='sudo protonvpn'
+alias fish='fish ~/.config/fish/functions/my_aliases.fish && fish'
+alias rm='rm --preserve-root'
+alias ll='ls -lArth'
+alias la='ls -A'
+alias l='ls -CF'
+alias tor-browser-start='~/tor-browser_en-US/tor-browser_en-US/Browser/start-tor-browser --detach'
+                                                   

SetupCockpit/arch_based_installs.sh

@@ -17,14 +17,9 @@ else
   echo "${RED}Didn't install Keepass${NC}"
 fi
 
-echo "Setting up ProtonVPN..."
+echo "Installing ProtonVPN..."
 if sudo pacman -S openvpn dialog python-pip python-setuptools && sudo pip install protonvpn-cli; then
   echo "${GREEN}Successfully installed ProtonVPN${NC}"
-  if sudo protonvpn init; then
-    sudo protonvpn c --cc NL
-  else
-    echo "${RED}There was a problem with protonvpn init${NC}"
-  fi
 else
   echo "${RED}Didn't install ProtonVPN${NC}"
 fi

SetupCockpit/clone_projects.sh

@@ -2,12 +2,19 @@
 
 ## This script clones all the different repos
 
+
 ##################
 # REPOS ON LIME2 #
 ##################
 
-cd || exit 1
+echo "Setting up Keepass..."
-echo "Currently in $(pwd)"
+if [ -e ~/Keepass ]; then
+  echo "Keepass is already there, updating..."
+  cd ~/Keepass && git pull
+else
+  echo "Cloning new Keepass..."
+  cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/Keepass.git
+fi
 
 echo "Setting up VimConf..."
 if [ -e ~/VimConf ]; then
@@ -37,6 +44,16 @@ else
   cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/RootMe.git
 fi
 
+echo "Setting up PersonnalScripts..."
+if [ -e ~/PersonnalScripts ]; then
+  echo "PersonnalScripts is already there, updating..."
+  cd ~/PersonnalScripts && git pull
+else
+  echo "Cloning new PersonnalScripts..."
+  cd && git clone ssh://flyingscorpio@2px.info.tm/~/repos/PersonnalScripts.git
+fi
+
+
 ###################
 # REPOS ON GITLAB #
 ###################

SetupCockpit/debian_based_installs.sh

@@ -26,14 +26,9 @@ else
   echo "${RED}Didn't install Keepass${NC}"
 fi
 
-echo "Setting up ProtonVPN..."
+echo "Installing ProtonVPN..."
 if sudo apt install -y openvpn dialog python3-pip python3-setuptools && sudo pip3 install protonvpn-cli; then
   echo "${GREEN}Successfully installed ProtonVPN${NC}"
-  if sudo protonvpn init; then
-    sudo protonvpn c --cc NL
-  else
-    echo "${RED}There was a problem with protonvpn init${NC}"
-  fi
 else
   echo "${RED}Didn't install ProtonVPN${NC}"
 fi

SetupCockpit/setup_cockpit.sh

@@ -49,24 +49,22 @@ elif [ "$os" = 'arch' ]; then
   /bin/bash arch_based_installs.sh
 else
   echo "${RED} Didn't receive correct OS information, quitting...${NC}"
+  exit 1
 fi
 
 /bin/bash separator.sh
 
 
-####################
+########################
-# Set bash aliases #
+# Update .bash_aliases #
-####################
+########################
 
-echo "Writing aliases to ~/.bash_aliases..."
+echo "Updating .bash_aliases..."
-echo "alias lime2connect='ssh flyingscorpio@2px.info.tm'
+if cp ~/PersonnalScripts/SetupCockpit/.bash_aliases ~/.bash_aliases; then
-alias protonvpn='sudo protonvpn'
+  echo "${GREEN}Successfully updated .bash_aliases${NC}"
-alias fish='fish ~/.config/fish/functions/my_aliases.fish && fish'
+else
-alias rm='rm --preserve-root'
+  echo "${ORANGE}There was a problem while updating .bash_aliases${NC}"
-alias ll='ls -lArth'
+fi
-alias la='ls -A'
-alias l='ls -CF'
-alias tor-browser-start='~/tor-browser_en-US/tor-browser_en-US/Browser/start-tor-browser --detach'" >> ~/.bash_aliases
 
 /bin/bash separator.sh
 
@@ -117,3 +115,14 @@ echo "Cloning projects..."
 /bin/bash clone_projects.sh
 
 /bin/bash separator.sh
+
+
+#######################
+# Configure ProtonVPN #
+#######################
+
+if sudo protonvpn init; then
+  sudo protonvpn c --cc NL
+else
+  echo "${RED}There was a problem with protonvpn init${NC}"
+fi