fix: zsh script (#65)

* fix: zshScript Signed-off-by: Ayush Sharma <[email protected]> * removed comments Signed-off-by: Ayush Sharma <[email protected]> * fixed scripts Signed-off-by: Ayush Sharma <[email protected]> * removed sudo Signed-off-by: Ayush Sharma <[email protected]> --------- Signed-off-by: Ayush Sharma <[email protected]>
keploy · Sep 26, 2024 · 322526e · 322526e
1 parent 7ccfcf6
commit 322526e
Show file tree

Hide file tree

Showing 10 changed files with 127 additions and 125 deletions.
diff --git a/scripts/bash/keploy_record_script.sh b/scripts/bash/keploy_record_script.sh
@@ -1,6 +1,5 @@
 #!/bin/bash -i
 
-# folderpath="$2"
 log_file_path="$1"
 
 # Extract command from keploy.yml
@@ -11,9 +10,7 @@ if [[ ! -f "$keploy_config" ]]; then
 fi
 
 command=$(awk '/command:/ { $1=""; sub(/^ /, ""); print }' "$keploy_config")
-# echo "Command in yml file: $command"
 
-# Check if command is empty
 if [[ -z "$command" ]]; then
     echo "Command is not specified in keploy.yml."
     exit 1
@@ -31,22 +28,14 @@ if [[ "$command" =~ .*"go".* ]]; then
   go build -o application
 
 elif [[ "$command" =~ .*"python3".* ]]; then
-  # echo "Python3 command found"
   python3 -m venv venv
-  # echo "venv created"
   source venv/bin/activate
-  # echo "venv activated"
   pip install -r requirements.txt
-  # echo "requirements installed"
 
 elif [[ "$command" =~ .*"python".* ]] ; then
-# echo "Python command found"
   python -m venv venv
-  # echo "venv created"
   source venv/bin/activate
-  # echo "venv activated"
   pip install -r requirements.txt
-  # echo "requirements installed"
 
 elif [[ "$command" =~ .*"node".* ]]; then
   npm install
@@ -58,7 +47,7 @@ fi
 # Check if running on WSL
 if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null ; then
   export PATH=$(echo "$PATH" | tr ' ' '\n' | grep -v " " | tr '\n' ':')
-  keploycmd="sudo -E keploy"
+  keploycmd="sudo -E env PATH=\"$PATH\" keploy"
 else
   keploycmd="sudo -E env PATH=\"$PATH\" keploy"
 fi
@@ -80,9 +69,7 @@ sudo -E $keploycmd record  > "$fifo" 2>&1
 
 # Clean up: Wait for keploy command to finish
 wait $!
-touch ./log_file.txt
 
-
 # Terminate the dummy process and the logging process
 kill $dummy_pid
 wait $cat_pid

diff --git a/scripts/bash/keploy_test_script.sh b/scripts/bash/keploy_test_script.sh
@@ -1,6 +1,5 @@
 #!/bin/bash -i
 
-# folderpath="$2"
 log_file_path="$1"
 
 # Create log file if it doesn't exist
@@ -12,57 +11,35 @@ chmod 666 "$log_file_path"
 
 # Extract the command from keploy.yml
 command=$(awk -F: '/command:/ {gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2}' keploy.yml)
-# echo "Command in yml file: $command"
 
-# echo "Command in yml file: $command"
 if [[ "$command" =~ .*"go".* ]]; then
-  # echo "Go is present."
   go mod download
   go build -o application
 
 elif [[ "$command" =~ .*"python3".* ]]; then
-  # echo "Python 3 is present, Activating Virtual Environment 🐍"
   python3 -m venv venv
   source venv/bin/activate
-  # echo 'Installing requirements 📦'
   pip install -r requirements.txt
-  # echo 'Test Mode Starting 🎉'
 
 elif [[ "$command" =~ .*"python".* ]] ; then
-  # echo "Python is present, Activating Virtual Environment 🐍"
   python -m venv venv
   source venv/bin/activate
-  # echo 'Installing requirements 📦'
   pip install -r requirements.txt
-  # echo 'Test Mode Starting 🎉'
 
 elif [[ "$command" =~ .*"node".* ]]; then
-  # echo "Node is present."
   npm install
 
 elif [[ "$command" =~ .*"java".* ]]  || [[ "$command" =~ .*"mvn".* ]]; then
-  # echo "Java is present."
   mvn clean install
-
 fi 
 
 # Check if running on WSL
 if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null ; then
-  # echo "Running on WSL"
-  # Temporarily modify PATH
   export PATH=$(echo "$PATH" | tr ' ' '\n' | grep -v " " | tr '\n' ':')
-  keploycmd="sudo -E keploy"
+  keploycmd="sudo -E env PATH=\"$PATH\" keploy"
 else
-  # echo "Not running on WSL"
-  # Original PATH handling
   keploycmd="sudo -E env PATH=\"$PATH\" keploy"
 fi
 
-# echo "Keploy command: $keploycmd"
-
-# cd "$folderpath"
-
 # Execute the keploy command and append the output to the log file
-sudo $keploycmd test | tee -a "$log_file_path"
-touch ./log_file.txt
-
+sudo $keploycmd test | tee -a "$log_file_path"
diff --git a/scripts/zsh/keploy_record_script.sh b/scripts/zsh/keploy_record_script.sh
@@ -0,0 +1,74 @@
+#!/bin/zsh
+
+log_file_path="$1"
+
+# Extract command from keploy.yml
+keploy_config="keploy.yml"
+if [[ ! -f "$keploy_config" ]]; then
+    echo "keploy.yml file not found in the current directory."
+    exit 1
+fi
+
+command=$(awk '/command:/ { $1=""; sub(/^ /, ""); print }' "$keploy_config")
+
+# Check if command is empty
+if [[ -z "$command" ]]; then
+    echo "Command is not specified in keploy.yml."
+    exit 1
+fi
+
+# Create log file if it doesn't exist
+touch "$log_file_path"
+: > "$log_file_path" # Clear the log file
+
+# Set permissions of the log file
+chmod 666 "$log_file_path"
+
+if [[ "$command" =~ .*"go".* ]]; then
+  go mod download
+  go build -o application
+
+elif [[ "$command" =~ .*"python3".* ]]; then
+  python3 -m venv venv
+  source venv/bin/activate
+  pip install -r requirements.txt
+
+elif [[ "$command" =~ .*"python".* ]] ; then
+  python -m venv venv
+  source venv/bin/activate
+  pip install -r requirements.txt
+
+elif [[ "$command" =~ .*"node".* ]]; then
+  npm install
+
+elif [[ "$command" =~ .*"java".* ]]  || [[ "$command" =~ .*"mvn".* ]]; then
+  mvn clean install
+fi 
+
+# Create a named pipe
+fifo=$(mktemp -u)
+mkfifo "$fifo"
+
+# Background process to read from the named pipe and write to the log file
+cat "$fifo" | tee -a "$log_file_path" &
+cat_pid=$!
+
+# Dummy background process to keep the parent script running
+(while true; do sleep 1; done) &
+dummy_pid=$!
+
+# Check if running on WSL
+if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null ; then
+  sudo -E env "PATH=$PATH" keploy record  > "$fifo" 2>&1
+else
+  keploycmd="sudo -E env PATH=\"$PATH\" keploy"
+  eval $keploycmd record > "$fifo" 2>&1
+fi
+
+# Clean up: Wait for keploy command to finish
+wait $! 
+
+# Terminate the dummy process and the logging process
+kill $dummy_pid
+wait $cat_pid
+rm "$fifo"
diff --git a/scripts/zsh/keploy_record_script.zsh b/scripts/zsh/keploy_record_script.zsh
diff --git a/scripts/zsh/keploy_test_script.sh b/scripts/zsh/keploy_test_script.sh
@@ -0,0 +1,43 @@
+#!/bin/zsh
+
+log_file_path="$1"
+
+# Create log file if it doesn't exist
+touch "$log_file_path"
+: > "$log_file_path" # Clear the log file
+
+# Set permissions of the log file
+chmod 666 "$log_file_path"
+
+# Extract the command from keploy.yml
+command=$(awk -F: '/command:/ {gsub(/^[ \t]+|[ \t]+$/, "", $2); print $2}' keploy.yml)
+
+if [[ "$command" =~ .*"go".* ]]; then
+  go mod download
+  go build -o application
+
+elif [[ "$command" =~ .*"python3".* ]]; then
+  python3 -m venv venv
+  source venv/bin/activate
+  pip install -r requirements.txt
+
+elif [[ "$command" =~ .*"python".* ]] ; then
+  python -m venv venv
+  source venv/bin/activate
+  pip install -r requirements.txt
+
+elif [[ "$command" =~ .*"node".* ]]; then
+  npm install
+
+elif [[ "$command" =~ .*"java".* ]]  || [[ "$command" =~ .*"mvn".* ]]; then
+  mvn clean install
+
+fi 
+
+# Check if running on WSL
+if grep -qEi "(Microsoft|WSL)" /proc/version &> /dev/null ; then
+  sudo -E env "PATH=$PATH" keploy test | tee -a "$log_file_path"
+else
+  keploycmd="sudo -E env PATH=\"$PATH\" keploy"
+  eval $keploycmd test | tee -a "$log_file_path"
+fi
diff --git a/scripts/zsh/keploy_test_script.zsh b/scripts/zsh/keploy_test_script.zsh
diff --git a/src/OneClickInstall.ts b/src/OneClickInstall.ts
@@ -5,7 +5,7 @@ export default function executeKeployOneClickCommand(): void {
     const checkKeployExistsCommand = `keploy`;
 
     // The command to download and install Keploy
-    const installationCommand = `curl --silent -L https://keploy.io/install.sh -o /tmp/install.sh && chmod +x /tmp/install.sh && bash /tmp/install.sh -noRoot -platform bash`;
+    const installationCommand = `curl --silent -L https://keploy.io/install.sh -o /tmp/install.sh && chmod +x /tmp/install.sh && /tmp/install.sh -noRoot`;
     exec(checkKeployExistsCommand, (error, stdout, stderr) => {
         if (error) {
             // Execute the installation command

diff --git a/src/Record.ts b/src/Record.ts
@@ -105,7 +105,7 @@ export async function startRecording( wslscriptPath: string, wsllogfilePath: str
 
                     console.log(`Current default shell: ${currentShell}`);
                     //uncomment the below line if you want to use the default shell (for zsh test)
-                    // terminalPath = currentShell; 
+                    terminalPath = currentShell; 
                 }
                 console.log(`Terminal path: ${terminalPath}`);
                 const terminal = vscode.window.createTerminal({
@@ -121,7 +121,7 @@ export async function startRecording( wslscriptPath: string, wsllogfilePath: str
                     if (currentShell.includes('zsh')) {
                         // Use a Zsh-specific script if needed
                         //replace bashScriptPath with zshScriptPath for zsh
-                        recordCmd = `"${bashScriptPath}" "${logfilePath}" `;
+                        recordCmd = `"${zshScriptPath}" "${logfilePath}" ;exit 0`;
                     } else {
                         // Default to Bash script
                         recordCmd = `"${bashScriptPath}" "${logfilePath}" ;exit 0`;

diff --git a/src/SidebarProvider.ts b/src/SidebarProvider.ts
@@ -173,7 +173,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
             console.log('Start Recording button clicked');
 
             const bashScript = vscode.Uri.joinPath(this._extensionUri, "scripts", "bash", "keploy_record_script.sh");
-            const zshScript = vscode.Uri.joinPath(this._extensionUri, "scripts", "zsh", "keploy_record_script.zsh");
+            const zshScript = vscode.Uri.joinPath(this._extensionUri, "scripts", "zsh", "keploy_record_script.sh");
             const logfilePath = vscode.Uri.joinPath(this._extensionUri, "scripts", "logs", "record_mode.log");
             let wslscriptPath = bashScript.fsPath;
             let wsllogPath = logfilePath.fsPath;
@@ -222,7 +222,7 @@ export class SidebarProvider implements vscode.WebviewViewProvider {
           try {
             console.log('Start Testing button clicked');
             const bashScript = vscode.Uri.joinPath(this._extensionUri, "scripts", "bash", "keploy_test_script.sh");
-            const zshScript = vscode.Uri.joinPath(this._extensionUri, "scripts", "zsh", "keploy_test_script.zsh");
+            const zshScript = vscode.Uri.joinPath(this._extensionUri, "scripts", "zsh", "keploy_test_script.sh");
             const logfilePath = vscode.Uri.joinPath(this._extensionUri, "scripts", "logs", "test_mode.log");
             let wslscriptPath = bashScript.fsPath;
             let wsllogPath = logfilePath.fsPath;

diff --git a/src/Test.ts b/src/Test.ts
@@ -319,7 +319,7 @@ export async function startTesting(wslscriptPath: string, wsllogfilePath: string
 
                     console.log(`Current default shell: ${currentShell}`);
                     //uncomment the below line if you want to use the default shell (for zsh test)
-                    // terminalPath = currentShell;
+                    terminalPath = currentShell;
                 }
                 console.log(`Terminal path: ${terminalPath}`);
                 const terminal = vscode.window.createTerminal({
@@ -338,7 +338,7 @@ export async function startTesting(wslscriptPath: string, wsllogfilePath: string
                         // Use a Zsh-specific script if needed
                         console.log('Using Zsh script');
                         //replace bashScriptPath with zshScriptPath for zsh
-                        testCmd = `"${bashScriptPath}" "${logfilePath}"; exit 0`;
+                        testCmd = `"${zshScriptPath}" "${logfilePath}"; exit 0`;
                     } else {
                         // Default to Bash script
                          testCmd = `"${bashScriptPath}" "${logfilePath}" ; exit 0`;