[openrtm-commit:01667] r2688 - in branches/RELENG_1_1/OpenRTM-aist: . build

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-12-14 18:52:11 +0900 (Mon, 14 Dec 2015)
New Revision: 2688

Modified:
   branches/RELENG_1_1/OpenRTM-aist/
   branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
Log:
[merge] r2684,2687 has been merged from trunk.


Property changes on: branches/RELENG_1_1/OpenRTM-aist
___________________________________________________________________
Modified: svn:mergeinfo
   - /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2682
   + /tags/RELEASE_1_1_0/OpenRTM-aist:2364-2372
/tags/RELEASE_1_1_0_RC2/OpenRTM-aist:2173
/trunk/OpenRTM-aist:2154-2172,2174-2176,2180,2183-2208,2213,2328,2346,2381-2383,2389-2393,2397-2398,2400-2401,2409,2411-2412,2512-2513,2515-2516,2522-2525,2530-2531,2534-2539,2542-2543,2545-2546,2548-2566,2568,2573-2574,2592,2605,2610,2626,2648,2652-2653,2670,2677-2678,2682,2684-2687

Modified: branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2015-12-14 09:47:21 UTC (rev 2687)
+++ branches/RELENG_1_1/OpenRTM-aist/build/pkg_install_fedora.sh	2015-12-14 09:52:11 UTC (rev 2688)
@@ -27,6 +27,15 @@
 reposervers="openrtm.org"
 reposerver=""
 
+#---------------------------------------
+# yum / dnf コマンド切替え
+#---------------------------------------
+if [ $version_num -ge 22 ]; then
+    COMMAND="dnf"
+else
+    COMMAND="yum"
+fi
+
 #----------------------------------------
 # root かどうかをチェック
 #----------------------------------------
@@ -117,7 +126,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
@@ -142,7 +151,7 @@
 uninstall_packages () {
     for p in $*; do
 	echo "Now uninstalling: " $p
-	yum erase $p
+	$COMMAND erase $p
 	echo "done."
 	echo ""
     done