sudo

yegor256 · Apr 27, 2024 · d79763a · d79763a
1 parent 493c466
commit d79763a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 21 deletions.
diff --git a/help/sudo.sh b/help/sudo.sh
@@ -24,6 +24,10 @@ 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 "$@"

diff --git a/installs/install-pip.sh b/installs/install-pip.sh
@@ -24,13 +24,6 @@
 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
-fi
-
 "${LOCAL}/help/assert-tool.sh" python3 --version
 "${LOCAL}/help/assert-tool.sh" pip --version
 

diff --git a/steps/install.sh b/steps/install.sh
@@ -27,22 +27,15 @@ set -o pipefail
 set -x
 
 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
-fi
-
-if "${LOCAL}/help/is-linux.sh"; then
-  apt-get update -y --fix-missing
-  apt-get install -y coreutils
+  "${LOCAL}/help/sudo.sh" apt-get update -y --fix-missing
+  "${LOCAL}/help/sudo.sh" apt-get install -y coreutils
 fi
 
 function install_package() {
     local PACKAGE=$1
     if ! eval "$PACKAGE" --version >/dev/null 2>&1; then
         if "${LOCAL}/help/is-linux.sh"; then
-            apt-get install -y "$PACKAGE"
+            "${LOCAL}/help/sudo.sh" apt-get install -y "$PACKAGE"
         else
           "${LOCAL}/help/assert-tool.sh" "${PACKAGE}" --version
         fi
@@ -60,17 +53,17 @@ install_package gawk
 
 if ! pdftotext -v >/dev/null 2>&1; then
   if "${LOCAL}/help/is-linux.sh"; then
-    apt-get install -y xpdf
+    "${LOCAL}/help/sudo.sh" apt-get install -y xpdf
   else
     "${LOCAL}/help/assert-tool.sh" pdftotext -v
   fi
 fi
 
 if ! inkscape --version >/dev/null 2>&1; then
   if "${LOCAL}/help/is-linux.sh"; then
-    add-apt-repository -y ppa:inkscape.dev/stable && \
-      apt-get update -y --fix-missing && \
-      apt-get install -y inkscape
+    "${LOCAL}/help/sudo.sh" add-apt-repository -y ppa:inkscape.dev/stable && \
+      "${LOCAL}/help/sudo.sh" apt-get update -y --fix-missing && \
+      "${LOCAL}/help/sudo.sh" apt-get install -y inkscape
   else
     "${LOCAL}/help/assert-tool.sh" inkscape --version
   fi