[openrtm-commit:01663] r2684 - trunk/OpenRTM-aist/build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-12-11 17:17:34 +0900 (Fri, 11 Dec 2015)
New Revision: 2684

Modified:
   trunk/OpenRTM-aist/build/pkg_install_fedora.sh
Log:
[compat] Install script has been updated to support dnf command in fedora22 later.

Modified: trunk/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_fedora.sh	2015-12-11 01:00:24 UTC (rev 2683)
+++ trunk/OpenRTM-aist/build/pkg_install_fedora.sh	2015-12-11 08:17:34 UTC (rev 2684)
@@ -23,9 +23,18 @@
 devel="gcc-c++ uuid-devel libuuid-devel"
 packages="$devel $omni $openrtm"
 
-reposervers="www.openrtm.org www.openrtm.de"
+reposervers="openrtm.org"
 reposerver=""
 
+#---------------------------------------
+# yum / dnf コマンド切替え
+#---------------------------------------
+if [ $version_num -ge 22 ]; then
+    COMMAND="dnf"
+else
+    COMMAND="yum"
+fi
+
 #----------------------------------------
 # root かどうかをチェック
 #----------------------------------------
@@ -115,7 +124,7 @@
 	ins=`rpm -qa $p`
 	if test "x$ins" = "x"; then
 	    echo "Now installing: " $p
-	    yum install $p
+	    $COMMAND install $p
 	    echo "done."
 	    echo ""
 	else
@@ -140,7 +149,7 @@
 uninstall_packages () {
     for p in $*; do
 	echo "Now uninstalling: " $p
-	yum erase $p
+	$COMMAND erase $p
 	echo "done."
 	echo ""
     done