Changeset 37490

Timestamp:

2023-03-13T23:51:09+13:00 (8 days ago)

Author:

davidb

Message:

Changes after testing on cygwin

Location:

gs3-extensions/selfcontained-nodejs/trunk

Files:

• PREPARE-CYGWIN.sh (modified) (1 diff)
• PREPARE-LINUX.sh (modified) (1 diff)
• SETUP.sh (modified) (2 diffs)

gs3-extensions/selfcontained-nodejs/trunk/PREPARE-CYGWIN.sh

@@ -3 +3 @@
 version=-v16.13.2
 
+if [ -d node-windows-64bit ] ; then
+    /bin/rm -rf node-windows-64bit
+fi
 
 unzip node${version}-win-x64.zip \
     && mv node${version}-win-x64 node-windows-64bit
+
+chmod a+x node-windows-64bit/*.{exe,bat,cmd} node-windows-64bit/{npm,npx}
 
 if [ $? = 0 ] ; then

gs3-extensions/selfcontained-nodejs/trunk/PREPARE-LINUX.sh

@@ -20 +20 @@
 os_root=${os_full_lc%%_*}
 
-if [ "x$os_root" = "xcygwin" ] ; then
-    if [ ! -x $installed_dir/node.exe ] ; then
-    echo "" >&2
-    echo "**** Note ****" >&2
-    echo "Under Cygwin, the programs in the 'bin' directory often lack" >&2
-    echo "execute permissions.  This can be addressed with:" >&2
-    echo "    chmod a+x $installed_dir/*.{exe,bat,cmd} $installed_dir/{npm,npx}" >&2
-    fi
-fi
+#if [ "x$os_root" = "xcygwin" ] ; then
+#    if [ ! -x $installed_dir/node.exe ] ; then
+#   echo "" >&2
+#   echo "**** Note ****" >&2
+#   echo "Under Cygwin, the programs in the 'bin' directory often lack" >&2
+#   echo "execute permissions.  This can be addressed with:" >&2
+#   echo "    chmod a+x $installed_dir/*.{exe,bat,cmd} $installed_dir/{npm,npx}" >&2
+#    fi
+#fi

gs3-extensions/selfcontained-nodejs/trunk/SETUP.sh

@@ -3 +3 @@
 OS_LOWERCASE=`uname -s | tr '[:upper:]' '[:lower:]' | sed 's/_.*$//'`
 
-if test $OS_LOWERCAPS = "cygwin" ; then
-    OS_UPPERCAPS=WINDOWS
-    OS_LOWERCAPS=windows
+if test $OS_LOWERCASE = "cygwin" ; then
+    OS_UPPERCASE=WINDOWS
+    OS_LOWERCASE=windows
 fi
 
 package_name="NodeJS"
-installed_dir=node-${OS_LOWERCAPS}-64bit
+installed_dir=node-${OS_LOWERCASE}-64bit
 
 full_installed_dir="$PWD/$installed_dir"
@@ -25 +25 @@
 
 NODE_HOME="$full_installed_dir"                ; export NODE_HOME
-NODE_PATH=$full_installed_dir/lib/node_modules ; export NODE_PATH
-PATH="$NODE_HOME/bin:$PATH"                    ; export PATH
+
+if [ "x$OS_LOWERCASE" = "xwindows" ] ; then
+    PATH="$NODE_HOME:$PATH"                    ; export PATH    
+else
+    NODE_PATH=$full_installed_dir/lib/node_modules ; export NODE_PATH
+    PATH="$NODE_HOME/bin:$PATH"                    ; export PATH    
+fi
 
 echo + "Set NODE_HOME, NODE_PATH and updated PATH"