touch build

Author: cdburke

build.txt

@@ -1 +1 @@
-102
+103

misc/install-usr.sh

@@ -20,9 +20,10 @@ else
  exit 1
 fi
 
+P=`pwd`
 cd ..
 [ "j9.7" = ${PWD##*/} ] || [ "jlibrary" = ${PWD##*/} ] || { echo "directory not j9.7" ; exit 1; }
-cd -
+cd "$P"
 
 [ "Darwin" = "$(uname)" ] || [ "$(id -u)" = "0" ] || { echo "need sudo" ; exit 1; }
 

script/jinstall.sh

@@ -11,7 +11,7 @@ V=j9.7
 
 OS=$(uname -s)
 if [ "$OS" != "Darwin" ] && [ "$OS" != "Linux" ]; then
- echo "This script only works for Linux or macOS, not for $OS"
+ printf "This script only works for Linux or macOS, not for $OS\n"
  exit 1
 fi
 
@@ -29,6 +29,7 @@ Give other parameters in order, use "" or empty for the default
 
 [Dir] - installation top level directory, default $HOME.
         The installation is to a $V subdirectory of this.
+        In Linux, a directory of /usr makes a standard system install
 [Jqt] - Jqt installed, one of none|slim|full (default full)
 [Addons] - Addons installed, one of none|all (default none)
 
@@ -37,6 +38,7 @@ $(basename "$0")                 # install full Jqt system under home with no ad
 $(basename "$0") "" slim         # install slim Jqt system under home with no addons
 $(basename "$0") -f mydir none   # install base system only in mydir, no prompts
 $(basename "$0") mydir none all  # install base system in mydir plus all addons
+$(basename "$0") /usr none all   # system base system install on Linux
 EOF
  exit 0
 }
@@ -50,7 +52,7 @@ while [ $# -gt 0 ]; do
   -h|--help)    usage ;;
   -f|--force)   FORCE=1; shift ;;
   --)           shift; break ;;
-  -*)           echo "Unknown option: $1" >&2; usage ;;
+  -*)           printf "Unknown option: $1" >&2; usage ;;
   *)            break ;;   # first non-option argument → stop parsing
  esac
 done
@@ -64,7 +66,7 @@ A=${3:-"none"}
 # check likely incorrect directory
 case "$D" in
  none|slim|full|all)
- echo "The installation directory may not be one of the keywords: none|slim|full|all";
+ printf "The installation directory may not be one of the keywords: none|slim|full|all\n";
  exit 1 ;;
 esac
 
@@ -73,19 +75,45 @@ if [ "$D" = "home" ]; then D=$HOME; fi
 # check Jqt selection
 case "$P" in
  none|slim|full) ;;
- *) echo "Invalid Jqt selection: $P"; exit 1 ;;
+ *) printf "Invalid Jqt selection: $P\n"; exit 1 ;;
 esac
 
 # check Addons selection
 case "$A" in
  none|all) ;;
- *) echo "Invalid Addons selection: $A"; exit 1 ;;
+ *) printf "Invalid Addons selection: $A\n"; exit 1 ;;
 esac
 
+# ----------------------------------------------------------------------
+# check user/path/OS combo
+UID=`id -u`
+if [ "$D" = "/usr" ]; then
+ if [ "$OS" = "Darwin" ]; then
+  printf "This script does not support install to /usr in macOS\n"
+  exit 1
+ fi
+ if [ ! $UID = 0 ]; then
+  printf "Run this script as root to install under /usr\n"
+  exit 1
+ fi
+else
+ if [ $UID = 0 ]; then
+  printf "You are running this script as root. OK to continue? (y/N) "
+  read response
+  case "${response:-N}" in
+   [Yy]*) ;;
+   *) exit 1 ;;
+  esac
+ fi
+fi
+
+# ----------------------------------------------------------------------
 # resolve directory path
-mkdir -p $D
-cd $D
-D=`pwd`
+if [ ! "$D" = "/usr" ]; then
+ mkdir -p $D
+ cd $D
+ D=`pwd`
+fi
 
 # ----------------------------------------------------------------------
 # install message + prompt to continue
@@ -103,35 +131,45 @@ else
  m="$m and no Addons"
 fi
 
-echo "$m in $D"
+printf "$m in $D\n"
 
 if [ "$FORCE" = 0 ]; then
  printf 'OK to continue? (y/N) '
  read response
  case "${response:-N}" in   # defaults to N on Enter
   [Yy]*) ;;                 # do nothing
-  *) echo "Not done."; exit 1 ;;
+  *) printf "Not done.\n"; exit 1 ;;
  esac
 fi
 
 M=$(mktemp -d -t 'jtemp.XXXXXX')
+trap 'rm -rf "$M"' EXIT
 cd $M
 
 S="https://www.jsoftware.com/download/$V/install"
 
 if [ "$OS" = "Darwin" ]; then
  W=${V}_mac64.zip
- curl -O $S/$W
+ curl -OL $S/$W
  unzip $W
 else
  W=${V}_linux64.tar.gz
  wget $S/$W
  tar -xf $W
 fi
 
-mkdir -p $D/$V
-cp -r $M/$V/* $D/$V
-cd $D/$V
-rm -rf $M
+# ----------------------------------------------------------------------
+if [ "$D" = "/usr" ]; then
+ cd $V
+ bin/jconsole -js "install 'system $P $A'"
+ if [ -f "/etc/alternatives/ijconsole" ]; then
+  update-alternatives --remove-all ijconsole
+ fi
+ bin/install-usr.sh
+else
+ mkdir -p $D/$V
+ cp -r $M/$V/* $D/$V
+ cd $D/$V
+ bin/jconsole -js "install 'system $P $A'"
+fi
 
-bin/jconsole -js "install 'system $P $A'"