simplier

setup.sh

@@ -7,32 +7,29 @@ command_exists() {
 # if run as root
 [ "$(id -u)" = "0" ] && {
     if command_exists curl && command_exists git && command_exists lsb_release; then
-    echo
+        echo
     else
-    apt-get update -qq
-    # check if git & curl are installed
-    [ -z "$(command -v git)" ] && { apt-get -y install git; } >> /dev/null 2>&1
-    [ -z "$(command -v curl)" ] && { apt-get -y install curl; } >> /dev/null 2>&1
-    [ -e "$(command -v lsb_release)" ] && { apt-get -y install lsb_release; } >> /dev/null 2>&1
+        apt-get update -qq
+        # check if git & curl are installed
+        [ -z "$(command -v git)" ] && { apt-get -y install git; } >> /dev/null 2>&1
+        [ -z "$(command -v curl)" ] && { apt-get -y install curl; } >> /dev/null 2>&1
+        [ -e "$(command -v lsb_release)" ] && { apt-get -y install lsb_release; } >> /dev/null 2>&1
     fi
     [ ! -d "$HOME/.ssh" ] && { mkdir "$HOME/.ssh"; }
 
     # install cht.sh if not already installed
-    [ ! -x "$(command -v cht.sh)" ] && {
+    if ! command_exists cht.sh; then
         wget -O /usr/local/bin/cht.sh https://cht.sh/:cht.sh
         chmod +x /usr/local/bin/cht.sh
-    }
+        ln -s /usr/local/bin/cht.sh /usr/local/bin/cheat
+    fi
     # check for my ssh keys comment
-    [ -f $HOME/.ssh/authorized_keys ] && {
-        check_ecc=$(grep "virtubox.net_ecc" $HOME/.ssh/authorized_keys*)
-        check_rsa=$(grep "virtubox.net_rsa" $HOME/.ssh/authorized_keys*)
-    }
-    [ -z "$check_ecc" ] && {
+    if grep -qr "virtubox.net_ecc" $HOME/.ssh; then
         echo -e '\n# thomas@virtubox.net\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJez+vH3c5kWUqjZ9mjzzW9MTQJmzpgRC8g8vi3ToC9j thomas@virtubox.net_ecc' >> $HOME/.ssh/authorized_keys
-    }
-    [ -z "$check_rsa" ] && {
+    fi
+    if grep -qr "virtubox.net_rsa" $HOME/.ssh; then
         echo -e 'ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAgEA8S2kxEkO5KQpWTPA4/mrotGMuIqy4KUinpWEJURbgqvGgesCXmqwDzLqJuq1hPnJVclMS137L5+l53lLmJmfqgV+Vj9YQ+pviWOwP45n/GqMPagGx/Cvzx0HVm1RMRTprDpPjHoXMze0py8mWrXmyYdi4j/v+xGhV8NOsxrZD02zgdQwpu9HqFh7Z2Q4/IiPRknP5CkwcH9iD9sHVRYggBcNOhlF5ysbPza9xsYy49niLCWpW8fH4asdhlxZ/MIAymOWbmkmXewLFWC4nm9gE0e8j6hYCybBDI+v9BdUzSNB6zx4ZvbF5em3iuX/SowQurUbRJl3j2ZyFQ+CU3iZRtGt3P7mWoZCAPTGevrtgJa2sckges1sKZDn1p+CXqa+KKzHxmKWWM346qHms+6K9V92GDgbxGs8dzwJRKfGfwCulFMmhFxRtvB0tX1LQwCny4wa6aODSMd9whyfc9Pcr5aFOiJCKrp6zCsupS14O5/BIog9alEbFrBaq3nDn6S7xg4KBOxf9R9BPwyzZhHXheuP9AK+8Pdnep2WFwVupaGwwnz5ePMRZhImidO86I5lSp9JQ7RBDqBBNoiKIfWJA0xrdPQAlYy9Ppyyn/dxQiTBFgGYzHoTPBCopN+yPhh+59YJA5JlkxZhDhBuLU9Bi+o4oVdASHNaeBzdCr/o95U= thomas@virtubox.net_rsa\n' >> $HOME/.ssh/authorized_keys
-    }
+    fi
 }
 
 # clone mybashrc or update it
@@ -47,7 +44,6 @@ else
     fi
 fi
 
-
 if [ ! -d $HOME/.history ]; then
     mkdir -p $HOME/.history
 fi
@@ -72,4 +68,4 @@ else
 fi
 
 echo -e "#!/bin/bash --init-file\nsource $HOME/.bashrc" > /tmp/init-file
-/bin/bash --init-file /tmp/init-file
+/bin/bash --init-file /tmp/init-file