Changeset 36445 for gs3-extensions

Timestamp:

2022-08-22T17:01:42+12:00 (20 months ago)

Author:

davidb

Message:

Removal of packages-cli

Location:

gs3-extensions/selfcontained-nodejs/trunk

Files:

• cli-packages (deleted)
• setup.bash (modified) (3 diffs)

gs3-extensions/selfcontained-nodejs/trunk/setup.bash

@@ -10 +10 @@
 if [ "x$os_root" = "xlinux" ] ; then
     nodejs_package=$nodejs_package-linux-x64
-    export PATH=$PWD/cli-packages/$nodejs_package/bin:$PATH
+    export PATH=$PWD/$nodejs_package/bin:$PATH
     echo "Updated PATH to include node, npm and npx"
 
-    export NODE_PATH=$PWD/cli-packages/$nodejs_package/lib/node_modules
+    export NODE_PATH=$PWD/$nodejs_package/lib/node_modules
     echo "Set NODE_PATH to include $nodejs_package/lib/node_modules"
     
 elif [ "x$os_root" = "xcygwin" ] ; then
     nodejs_package=$nodejs_package-win-x64
-    export PATH=$PWD/cli-packages/$nodejs_package:$PATH
+    export PATH=$PWD/$nodejs_package:$PATH
     echo "Updated PATH to include node, npm and npx"    
 else
@@ -26 +26 @@
 fi
 
-if [ ! -d cli-packages/$nodejs_package ] ; then
+if [ ! -d $nodejs_package ] ; then
     echo "" >&2
     echo "Warning: Failed to find directory:" >&2
-    echo "  cli-packages/$nodejs_package" >&2
+    echo "  $nodejs_package" >&2
     echo "" >&2
     if [ "x$os_root" = "xcygwin" ] ; then
     echo "Have you unzipped the NodeJS binary distribution?" >&2
     echo "For example:" >&2
-    echo "  cd cli-packages && unzip $nodejs_package.zip" >&2
+    echo "  unzip $nodejs_package.zip" >&2
     else
     echo "Have you untarred the NodeJS binary distribution?" >&2
     echo "For example:" >&2
-    echo "  cd cli-packages && tar xvzf $nodejs_package.tar.gz" >&2
+    echo "  tar xvzf $nodejs_package.tar.gz" >&2
     fi
     echo "" >&2
@@ -45 +45 @@
 
 if [ "x$os_root" = "xcygwin" ] ; then
-    if [ ! -x cli-packages/$nodejs_package/node.exe ] ; then
+    if [ ! -x $nodejs_package/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 "  cd cli-packages && chmod a+x $nodejs_package/*.{exe,bat,cmd} $nodejs_package/{npm,npx}" >&2
+    echo "  chmod a+x $nodejs_package/*.{exe,bat,cmd} $nodejs_package/{npm,npx}" >&2
     fi
 fi