call functions from the main.sh

treehouses · May 11, 2024 · 440b6a4 · 440b6a4
1 parent 4b13aaf
commit 440b6a4
Show file tree

Hide file tree

Showing 8 changed files with 27 additions and 23 deletions.
diff --git a/main.sh b/main.sh
@@ -20,6 +20,10 @@ case "$1" in
         source $manageConfigPath/src/aws/load.sh
         driver "${@:2}"
         ;;
+    sshConfigManager)
+        source $manageConfigPath/src/utils/load.sh
+        driver "${@:2}"
+        ;;
     *)
         echo "Error: Invalid command."
         usage

diff --git a/src/utils/callUpdate.sh b/src/utils/callUpdate.sh
@@ -63,8 +63,8 @@ function update(){
     esac
 
 
-    update_ssh_config "$host" "$HostName" "$User" "$Port" "$IdentityFile" "$RemoteForward"
+    updateSshConfig "$host" "$HostName" "$User" "$Port" "$IdentityFile" "$RemoteForward"
 
 }
 
-update $host "RemoteForward" "8888:80" "8887:81"
+#update $host "RemoteForward" "8888:80" "8887:81"
diff --git a/src/utils/create.sh b/src/utils/create.sh
@@ -1,5 +1,5 @@
 
-create_ssh_config() {
+createSshConfig() {
     HOST_NAME="$1"
     HOST_ENTRY=$(cat <<EOF
 
@@ -24,4 +24,4 @@ EOF
     fi
 }
 
-create_ssh_config "myserver" "example.com" "user" "22" "~/.ssh/id_rsa" "8888:80,9999:443"
+#createSshConfig "myserver" "example.com" "user" "22" "~/.ssh/id_rsa" "8888:80,9999:443"
diff --git a/src/utils/delete.sh b/src/utils/delete.sh
@@ -1,8 +1,9 @@
 
 
-delete_ssh_config() {
+deleteSshConfig() {
     HOST_NAME="$1"
     TEMP_FILE=$(mktemp)
+    echo $HOST_NAME
 
     # Ensure the temporary file gets deleted
     trap "rm -f $TEMP_FILE" EXIT
@@ -15,4 +16,4 @@ delete_ssh_config() {
 
     echo "Configuration for $HOST_NAME deleted."
 }
-delete_ssh_config "remoteserver"
+#delete_ssh_config "remoteserver"
diff --git a/src/utils/dependencies/retrieve.sh b/src/utils/dependencies/retrieve.sh
@@ -26,4 +26,4 @@ extractSshConfigToVariables() {
     echo "Port: $PORT"
     echo "IdentityFile: $IDENTITYFILE"
     echo "RemoteForward: $REMOTEFORWARD"
-    }
+}
diff --git a/src/utils/driver.sh b/src/utils/driver.sh
@@ -1,4 +1,3 @@
-source load.sh
 
 function sshConfigManagerUsage() {
     echo "Usage: driver <command> [options]"
@@ -22,13 +21,13 @@ function driver() {
     # Execute the appropriate command
     case "$1" in
         create)
-            create "${@:2}"
+            createSshConfig "${@:2}"
             ;;
         update)
-            callUpdate "${@:2}"
+            update "${@:2}"
             ;;
         delete)
-            delete "${@:2}"
+            deleteSshConfig "${@:2}"
             ;;
         *)
             echo "Error: Invalid command."

diff --git a/src/utils/load.sh b/src/utils/load.sh
@@ -1,11 +1,11 @@
-manageConfigPath=$(pwd)
-source $manageConfigPath/dependencies/config.sh
-source $manageConfigPath/dependencies/array.sh
-source $manageConfigPath/dependencies/read.sh
-source $manageConfigPath/dependencies/replace.sh
-source $manageConfigPath/dependencies/retrieve.sh
+source $manageConfigPath/src/utils/dependencies/config.sh
+source $manageConfigPath/src/utils/dependencies/array.sh
+source $manageConfigPath/src/utils/dependencies/read.sh
+source $manageConfigPath/src/utils/dependencies/replace.sh
+source $manageConfigPath/src/utils/dependencies/retrieve.sh
 
-source $manageConfigPath/create.sh
-source $manageConfigPath/update.sh
-source $manageConfigPath/delete.sh
-source $manageConfigPath/callUpdate.sh
+source $manageConfigPath/src/utils/create.sh
+source $manageConfigPath/src/utils/update.sh
+source $manageConfigPath/src/utils/delete.sh
+source $manageConfigPath/src/utils/callUpdate.sh
+source $manageConfigPath/src/utils/driver.sh
diff --git a/src/utils/update.sh b/src/utils/update.sh
@@ -1,4 +1,4 @@
-update_ssh_config() {
+updateSshConfig() {
     HOST_NAME="$1"
     TEMP_FILE=$(mktemp)
 
@@ -11,6 +11,6 @@ update_ssh_config() {
     !skip {print}
     ' $CONFIG > "$TEMP_FILE" && mv "$TEMP_FILE" $CONFIG
 
-    create_ssh_config "$@"
+    createSshConfig "$@"
     echo "Configuration for $HOST_NAME updated."
 }