fix(CICD): remove if os

Geode-solutions · Jun 19, 2024 · 8e56d95 · 8e56d95
1 parent 37bad70
commit 8e56d95
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 16 deletions.
diff --git a/electron-server/install_back.sh b/electron-server/install_back.sh
@@ -3,16 +3,10 @@ set -e
 rm -rf electron-server/venv_back electron-server/dist_back electron-server/build electron-server/requirements_back.txt
 folder=electron-server/venv_back
 python3 -m venv $folder
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    bin_folder=$folder/bin
-    source $bin_folder/activate
-elif [[ "$OSTYPE" == "msys" ]]; then
-    bin_folder=$folder/Scripts
-    $bin_folder/activate.bat
-fi
+bin_folder=$folder/bin
+source $bin_folder/activate
 pip install pip-tools
 pip-compile electron-server/requirements_back.in
 pip install -r electron-server/requirements_back.txt
 pip install pyinstaller
-ls -R electron-server/venv_back
 pyinstaller --onefile --collect-data opengeodeweb_back $bin_folder/geodeapp_back --distpath electron-server/dist_back
diff --git a/electron-server/install_viewer.sh b/electron-server/install_viewer.sh
@@ -3,16 +3,10 @@ set -e
 rm -rf electron-server/venv_viewer electron-server/dist_back electron-server/build electron-server/requirements_viewer.txt
 folder=electron-server/venv_viewer
 python3 -m venv $folder
-if [[ "$OSTYPE" == "linux-gnu"* ]]; then
-    bin_folder=$folder/bin
-    source $bin_folder/activate
-elif [[ "$OSTYPE" == "msys" ]]; then
-    bin_folder=$folder/Scripts
-    $bin_folder/activate.bat
-fi
+bin_folder=$folder/bin
+source $bin_folder/activate
 pip install pip-tools
 pip-compile electron-server/requirements_viewer.in
 pip install -r electron-server/requirements_viewer.txt
 pip install pyinstaller
-ls -R electron-server/venv_viewer
 pyinstaller --onefile --collect-data opengeodeweb_viewer --collect-all vtkmodules $bin_folder/geodeapp_viewer --distpath electron-server/dist_viewer