Changed to handle cpanel client script

diff --git a/rc/bash_login b/rc/bash_login
index 4cfce77..c59c2b7 100644 (file)
--- a/rc/bash_login
+++ b/rc/bash_login
@@ -310,6 +310,14 @@ for script in $(\ls ~/.rc/client_scripts); do
      ! -d ~/.rc/client_scripts/$script ]; then
     source ~/.rc/client_scripts/$script
   fi
+
+  # Special case for cPanel. Above relies on just the execute bit but
+  # git tracks mode. So we can't have it executable while at home. So
+  # instead we will look if we are on a 10. network (i.e. at cPanel)
+  # verses a 192. network at home.
+  if [[ $(/bin/hostname -i) =~ 10\. && $script = "cPanel" ]]; then
+    source ~/.rc/client_scripts/$script
+  fi
 done
 
 # Set prompt as client customization may have changed things

diff --git a/rc/client_scripts/cPanel b/rc/client_scripts/cPanel
index c66c9c6..70db567 100755 (executable)
--- a/rc/client_scripts/cPanel
+++ b/rc/client_scripts/cPanel
@@ -24,12 +24,13 @@ append_to_path /opt/cplint/bin
 append_to_path /root/bin
 
 # Find code!
-codePath=$(dirname $(find ~/.vscode-server/bin -name code))
-
-if [ -n "$codePath" ]; then
-  append_to_path $codePath
-else
-  echo "Warning - unable to find code"
+if [ -d ~/.vscode-server ]; then
+  codePath=$(dirname $(find ~/.vscode-server/bin -name code))
+  if [ -n "$codePath" ]; then
+    append_to_path $codePath
+  else
+    echo "Warning - unable to find code"
+  fi
 fi
 
 # Intended to be used for root

diff --git a/rc/system b/rc/system
index 4d2c672..b5b02cd 100644 (file)
--- a/rc/system
+++ b/rc/system
@@ -28,10 +28,15 @@ case "$SYSNAME" in
     ;;
 
   10-2-99-60)
-    SYSNAME="Sandbox"
+    SYSNAME="Sandbox Centos"
     ;;
 
   10-2-99-106)
-    SYSNAME="SandboxAL"
+    SYSNAME="Sandbox AlmaLinux"
     ;;
+
+  10-2-98-185)
+    SYSNAME="Sandbox Ubuntu"
+    ;;
+
 esac