Fixed installation scripts.

gomlx · Nov 26, 2024 · 7df853e · 7df853e
1 parent 4de06e6
commit 7df853e
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/cmd/install_darwin_amd64.sh b/cmd/install_darwin_amd64.sh
@@ -22,8 +22,18 @@ PLATFORM="darwin_amd64"
 
 # Base installation directory:
 GOPJRT_INSTALL_DIR="${GOPJRT_INSTALL_DIR:-/usr/local}"
+echo "Installing GoPJRT C/C++ dependencies under ${GOPJRT_INSTALL_DIR} (lib/ and include/ sub-directories)"
+echo "  - Set GOPJRT_INSTALL_DIR if you want another directory."
+
+# Should it use 'sudo' while installing ?
 _SUDO="sudo"
 if [[ "${GOPJRT_NOSUDO}" != "" ]] ; then
+  echo "  - Not using sudo during installation, disabled with GOPJRT_NOSUDO != ''."
+  _SUDO=""
+elif command -v sudo ; then
+  echo "  - Using sudo when extracting files to final destination (Set GOPJRT_NOSUDO=1 if you don't want sudo to be used)"
+else
+  echo "  - Not using sudo during installation, no program 'sudo' found in PATH."
   _SUDO=""
 fi
 
@@ -48,7 +58,7 @@ if [[ "${_SUDO}" != "" ]] ; then
   echo "Checking sudo authorization for installation"
   ${_SUDO} printf "\tsudo authorized\n"
 fi
-sudo tar xvzf "${tar_file}"
+${_SUDO} tar xvzf "${tar_file}"
 rm -f "${tar_file}"
 
 popd

diff --git a/cmd/install_darwin_arm64.sh b/cmd/install_darwin_arm64.sh
@@ -27,8 +27,18 @@ PLATFORM="darwin_arm64"
 
 # Base installation directory:
 GOPJRT_INSTALL_DIR="${GOPJRT_INSTALL_DIR:-/usr/local}"
+echo "Installing GoPJRT C/C++ dependencies under ${GOPJRT_INSTALL_DIR} (lib/ and include/ sub-directories)"
+echo "  - Set GOPJRT_INSTALL_DIR if you want another directory."
+
+# Should it use 'sudo' while installing ?
 _SUDO="sudo"
 if [[ "${GOPJRT_NOSUDO}" != "" ]] ; then
+  echo "  - Not using sudo during installation, disabled with GOPJRT_NOSUDO != ''."
+  _SUDO=""
+elif command -v sudo ; then
+  echo "  - Using sudo when extracting files to final destination (Set GOPJRT_NOSUDO=1 if you don't want sudo to be used)"
+else
+  echo "  - Not using sudo during installation, no program 'sudo' found in PATH."
   _SUDO=""
 fi
 
@@ -53,7 +63,7 @@ if [[ "${_SUDO}" != "" ]] ; then
   echo "Checking sudo authorization for installation"
   ${_SUDO} printf "\tsudo authorized\n"
 fi
-sudo tar xvzf "${tar_file}"
+${_SUDO} tar xvzf "${tar_file}"
 rm -f "${tar_file}"
 
 popd

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
@@ -1,3 +1,7 @@
+# Next
+
+* Fixed installation scripts: s/sudo/$_SUDO. Also made them more verbose.
+
 # v0.4.9 - 2024-11-25
 
 * Optional preloading CPU PJRT plugin: