Merge pull request #358 from nai1ka/fix-installation-on-mac

Fix installation on mac

Author: yegor256

help/sudo.sh

@@ -23,12 +23,19 @@
 set -e
 set -o pipefail
 
-if "${LOCAL}/help/is-linux.sh"; then
-  if [ ! "$(id -u)" = 0 ]; then
-    echo "You should run it as root: 'sudo make install'"
-    exit 1
-  fi
-  "$@"
-else
-  sudo "$@"
-fi
+if "${LOCAL}/help/is-linux.sh" || "${LOCAL}/help/is-macos.sh" ; then
+   if [ ! "$(id -u)" = 0 ]; then
+     echo "You should run it as root: 'sudo make install'"
+     exit 1
+   fi
+
+   if [ "$1" == "--as-user" ]; then
+     shift
+     sudo -u "$SUDO_USER" "$@"
+   else
+     # If no flag is provided, root is the default option
+     "$@"
+   fi
+ else
+   sudo "$@"
+ fi

installs/install-pmd.sh

@@ -48,5 +48,5 @@ wget --quiet "https://github.com/pmd/pmd/releases/download/pmd_releases%2F${pmd_
 unzip -qq "${name}.zip"
 rm "${name}.zip"
 mv "pmd-bin-${pmd_version}" pmd
-ln -s /usr/local/pmd/bin/run.sh /usr/local/bin/pmd
+ln -s /usr/local/pmd/bin/pmd /usr/local/bin/pmd
 echo "PMD installed into /usr/local/bin/pmd"

steps/install.sh

@@ -38,7 +38,7 @@ function install_package() {
             "${LOCAL}/help/sudo.sh" apt-get install -y "$PACKAGE"
         elif "${LOCAL}/help/is-macos.sh"; then
             if brew -v; then
-                brew install "$PACKAGE"
+                "${LOCAL}/help/sudo.sh" --as-user brew install "$PACKAGE"
             else 
                 echo "If you install Homebrew, all necessary packages will be installed automatically by running 'make install'. Visit the Homebrew installation documentation at: https://docs.brew.sh/Installation"
                 exit 1
@@ -59,15 +59,15 @@ install_package xmlstarlet
 install_package gawk
 
 if "${LOCAL}/help/is-macos.sh"; then
-  brew install coreutils
-  brew install wget
+  "${LOCAL}/help/sudo.sh" --as-user brew install coreutils
+  "${LOCAL}/help/sudo.sh" --as-user brew install wget
 fi
 
 if ! pdftotext -v >/dev/null 2>&1; then
   if "${LOCAL}/help/is-linux.sh"; then
     "${LOCAL}/help/sudo.sh" apt-get install -y xpdf
   elif "${LOCAL}/help/is-macos.sh"; then
-    brew install poppler
+    "${LOCAL}/help/sudo.sh" --as-user brew install poppler
   else
     "${LOCAL}/help/assert-tool.sh" pdftotext -v
   fi
@@ -79,7 +79,7 @@ if ! inkscape --version >/dev/null 2>&1; then
       "${LOCAL}/help/sudo.sh" apt-get update -y --fix-missing && \
       "${LOCAL}/help/sudo.sh" apt-get install -y inkscape
   elif "${LOCAL}/help/is-macos.sh"; then
-    brew install --cask inkscape
+   "${LOCAL}/help/sudo.sh" --as-user brew install --cask inkscape
   else
     "${LOCAL}/help/assert-tool.sh" inkscape --version
   fi