Revert "Bring in missing python (system dependency) (#1639)"

Since its causing all builds to fail

This reverts commit 53c72ea5ac4f103291fdd347b7cd9cc0dbafa4b5.

2 files changed, 8 insertions, 13 deletions

diff --git a/scripts/build-unix.sh b/scripts/build-unix.sh
index f485f9087..04aa9e70f 100755
--- a/scripts/build-unix.sh
+++ b/scripts/build-unix.sh
@@ -3,7 +3,7 @@
 # INTRO:
 # This file is used to build ferdium on both x64 and arm-based for macos and linux (not tested on arm for linux).
 # It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning)
-# It will install the system dependencies except for node and python (which are still verified)
+# It will install the system dependencies except for node (which is still verified)
 # I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently
 # This file can live anywhere in your PATH
 
@@ -32,7 +32,6 @@ command_exists() {
 #                  Checking the developer environment
 # Check for installed programmes
 command_exists node || fail_with_docs "Node is not installed"
-command_exists python || fail_with_docs "python is not installed"
 
 # Check node version
 EXPECTED_NODE_VERSION=$(cat .nvmrc)
@@ -43,15 +42,6 @@ if [ "v$EXPECTED_NODE_VERSION" != "$ACTUAL_NODE_VERSION" ]; then
     actual  : [$ACTUAL_NODE_VERSION]"
 fi
 
-# Check python version
-EXPECTED_PYTHON_VERSION=$(node -p 'require("./package.json").engines.python')
-ACTUAL_PYTHON_VERSION=$(python --version | sed -e "s/Python //")
-if [[ "$ACTUAL_PYTHON_VERSION" != "$EXPECTED_PYTHON_VERSION" ]]; then
-  fail_with_docs "You are not running the expected version of Python!
-    expected: [$EXPECTED_PYTHON_VERSION]
-    actual  : [$ACTUAL_PYTHON_VERSION]"
-fi
-
 # Check if the 'recipes' folder is present either as a git submodule or a symbolic link
 if ! [ -f "recipes/package.json" ]; then
   fail_with_docs "'recipes' folder is missing or submodule has not been checked out"
@@ -78,7 +68,7 @@ else
   fi
 
   npm cache clean --force
-  rm -rf ~/.npm ~/.electron-gyp
+  rm -rf ~/.npm ~/.electron-gyp ~/.asdf/installs/nodejs/*/.npm/
 
   git -C recipes clean -fxd # Clean recipes folder/submodule
   git clean -fxd            # Note: This will blast away the 'recipes' folder if you have symlinked it
@@ -89,6 +79,8 @@ fi
 
 # -----------------------------------------------------------------------------
 # Ensure that the system dependencies are at the correct version - recover if not
+# If 'asdf' is installed, reshim for new nodejs if necessary
+command_exists asdf && asdf reshim nodejs
 
 # Ensure that the system dependencies are at the correct version
 # Check pnpm version
@@ -107,6 +99,9 @@ if [[ "$EXPECTED_PNPM_VERSION" != "$EXPECTED_RECIPES_PNPM_VERSION" ]]; then
     actual               : [$EXPECTED_PNPM_VERSION]"
 fi
 
+# If 'asdf' is installed, reshim for new nodejs if necessary
+command_exists asdf && asdf reshim nodejs
+
 # -----------------------------------------------------------------------------
 printf "\n*************** Building recipes ***************\n"
 pushd recipes
diff --git a/scripts/build-windows.ps1 b/scripts/build-windows.ps1
index 02289d172..5da7df540 100644
--- a/scripts/build-windows.ps1
+++ b/scripts/build-windows.ps1
@@ -1,7 +1,7 @@
 # INTRO:
 # This file is used to build ferdium on windows.
 # It also handles any corrupted node modules with the 'CLEAN' env var (set it to 'true' for cleaning)
-# It will install the system dependencies except for node and python (which are still verified)
+# It will install the system dependencies except for node (which is still verified)
 # I sometimes symlink my 'recipes' folder so that any changes that I need to do in it can also be committed and pushed independently
 # This file can live anywhere in your PATH