Hotfix: Try to fix the weird devspace issue

Some users reported that the non-devspace code(some of which was bannable) was being executed in devspace despite the checks We've moved to eq and ne instead of comparing with == and !=
sounddrill31 · Sep 2, 2024 · 210f053 · 210f053
1 parent 1ce9493
commit 210f053
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 19 deletions.
diff --git a/.github/workflows/configure-runner.yml b/.github/workflows/configure-runner.yml
@@ -30,7 +30,7 @@ jobs:
       # Download and configure 'crave'.
     - name: Configure the 'crave' environment
       run: |
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
         echo 'No need to set up crave, we are already running in devspace!'
         else
           mkdir ${HOME}/bin/

diff --git a/.github/workflows/force-restart-runner.yml b/.github/workflows/force-restart-runner.yml
@@ -26,7 +26,7 @@ jobs:
       # Download and configure 'crave'.
     - name: Configure the 'crave' environment
       run: |
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
         echo 'No need to set up crave, we are already running in devspace!'
         else
           mkdir ${HOME}/bin/

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -302,13 +302,13 @@ jobs:
         else
           echo "We are already running in devspace... Skipping Symlinks"
         fi
-        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" == "1" ]; then
+        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone destroy -y $PROJECTFOLDER || echo "Error removing $PROJECTFOLDER"
         else          
         echo "Skipping removal"
         fi
 
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone create --projectID $PROJECTID $PROJECTFOLDER || echo "Crave clone create failed!"
         else
           mkdir $PROJECTFOLDER
@@ -375,7 +375,7 @@ jobs:
     - name: Configure the 'crave' environment
       run: |
         mkdir -p $PROJECTFOLDER/.repo/manifests
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
           echo 'No need to set up crave, we are already running in devspace!'
         else
           curl -s https://raw.githubusercontent.com/accupara/crave/master/get_crave.sh | bash -s --

diff --git a/.github/workflows/selfhosted.yml b/.github/workflows/selfhosted.yml
@@ -87,7 +87,7 @@ jobs:
       # Download and configure 'crave'.
     - name: Configure the 'crave' environment
       run: |
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
         echo 'No need to set up crave, we are already running in devspace!'
         else
           mkdir ${HOME}/bin/
@@ -351,7 +351,7 @@ jobs:
       # Create a project folder
     - name: Create Project Folders
       run: |
-        if [ "${DCDEVSPACE}" != "1" ]; then
+        if [ "${DCDEVSPACE}" -ne 1 ]; then
           echo "Symlinking devspace folder"
           mkdir -p devspace
           sudo mkdir -p /crave-devspaces
@@ -360,13 +360,13 @@ jobs:
         else
           echo "We are already running in devspace... Skipping Symlinks"
         fi
-        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" == "1" ]; then
+        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone destroy -y $PROJECTFOLDER || echo "Error removing $PROJECTFOLDER"
         else          
         echo "Skipping removal"
         fi
 
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone create --projectID $PROJECTID $PROJECTFOLDER || echo "Crave clone create failed!"
         else
           mkdir $PROJECTFOLDER
@@ -394,7 +394,7 @@ jobs:
     - name: Configure the 'crave' environment
       run: |
         mkdir -p $PROJECTFOLDER/.repo/manifests
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
         echo 'No need to set up crave, we are already running in devspace!'
         else
           curl -s https://raw.githubusercontent.com/accupara/crave/master/get_crave.sh | bash -s --
@@ -420,7 +420,7 @@ jobs:
     - name: Set the 'crave' project
       run: |
         cd $PROJECTFOLDER
-        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" == "1" ]; then
+        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" -eq 1 ]; then
           echo "Using Crave Clone... skipping"
         else
           echo "Running $REPO_INIT"
@@ -562,7 +562,7 @@ jobs:
     - name: Destroy Crave Clone
       if: ${{ always() }}
       run: |
-        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" == "1" ]; then
+        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone destroy -y $PROJECTFOLDER || echo "Error removing $PROJECTFOLDER"
         else          
           echo "Skipping removal"

diff --git a/.github/workflows/start-vscode.obsolete b/.github/workflows/start-vscode.obsolete
@@ -26,7 +26,7 @@ jobs:
       # Download and configure 'crave'.
     - name: Configure the 'crave' environment
       run: |
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
         echo 'No need to set up crave, we are already running in devspace!'
         else
           mkdir ${HOME}/bin/

diff --git a/.github/workflows/twrp-legacy.yml b/.github/workflows/twrp-legacy.yml
@@ -229,13 +229,13 @@ jobs:
         else
           echo "We are already running in devspace... Skipping Symlinks"
         fi
-        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" == "1" ]; then
+        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone destroy -y $PROJECTFOLDER || echo "Error removing $PROJECTFOLDER"
         else          
         echo "Skipping removal"
         fi
 
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone create --projectID $PROJECTID $PROJECTFOLDER || echo "Crave clone create failed!"
         else
           mkdir $PROJECTFOLDER
@@ -302,7 +302,7 @@ jobs:
     - name: Configure the 'crave' environment
       run: |
         mkdir -p $PROJECTFOLDER/.repo/manifests
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
           echo 'No need to set up crave, we are already running in devspace!'
         else
           curl -s https://raw.githubusercontent.com/accupara/crave/master/get_crave.sh | bash -s --

diff --git a/.github/workflows/twrp.yml b/.github/workflows/twrp.yml
@@ -229,13 +229,13 @@ jobs:
         else
           echo "We are already running in devspace... Skipping Symlinks"
         fi
-        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" == "1" ]; then
+        if grep -q "$PROJECTFOLDER" <(crave clone list --json | jq -r '.clones[]."Cloned At"') && [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone destroy -y $PROJECTFOLDER || echo "Error removing $PROJECTFOLDER"
         else          
         echo "Skipping removal"
         fi
 
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
           crave clone create --projectID $PROJECTID $PROJECTFOLDER || echo "Crave clone create failed!"
         else
           mkdir $PROJECTFOLDER
@@ -302,7 +302,7 @@ jobs:
     - name: Configure the 'crave' environment
       run: |
         mkdir -p $PROJECTFOLDER/.repo/manifests
-        if [ "${DCDEVSPACE}" == "1" ]; then
+        if [ "${DCDEVSPACE}" -eq 1 ]; then
           echo 'No need to set up crave, we are already running in devspace!'
         else
           curl -s https://raw.githubusercontent.com/accupara/crave/master/get_crave.sh | bash -s --