[Git][NTPsec/ntpsec][master] In buildprep, be forward-cinpatible to systems with zypper only.

[Eric S. Raymond]

Eric S. Raymond pushed to branch master at NTPsec / ntpsec


Commits:
c2916c48 by Eric S. Raymond at 2017-01-20T14:53:18-05:00
In buildprep, be forward-cinpatible to systems with zypper only.

- - - - -


1 changed file:

- buildprep


Changes:

=====================================
buildprep
=====================================
--- a/buildprep
+++ b/buildprep
@@ -21,7 +21,7 @@ else
     do=""
 fi
 
-if [ "$do" = "" -a "$UI" != 0 ]
+if [ "$do" = "" -a "$UID" != 0 ]
 then
     echo "#You must be running as root for your installer to do its thing."
     exit 1
@@ -37,6 +37,9 @@ then
 elif yast -h >/dev/null 2>&1
 then
     installer=yast
+elif zypper -h >/dev/null 2>&1
+then
+    installer=zypper
 else
     installer=unknown
 fi
@@ -63,12 +66,13 @@ case $installer in
 	$do yum libseccomp-devel install openssl-devel openssl-libs
 	$do yum pps-tools pps-tools-devel install python python-dev
 	;;
-    yast)
+    yast|zypper)
 	echo "# SLES versions 12 and earlier do not have pps-tools"
-	$do yast --install basis-devel gnuplot libcap-devel libcap2
-	$do yast --install liberation-fonts libseccomp-devel libsodium-devel
-	$do yast --install libsodium13 openssl-libs openssl-devel
-	$do yast --install python-devel
+	$do $installer --install basis-devel gnuplot libcap-devel libcap2
+	$do $installer --install liberation-fonts libseccomp-devel
+	$do $installer --install libsodium-devel libsodium13
+	$do $installer --install openssl-libs openssl-devel
+	$do $installer --install python-devel
 	;;
 esac
 



View it on GitLab: https://gitlab.com/NTPsec/ntpsec/commit/c2916c48afa0bc2ef71349fb3353de7d9c7217f9
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ntpsec.org/pipermail/vc/attachments/20170120/a9d76079/attachment.html>