[openrtm-commit:01615] r619 - in tags/RELEASE_1_1_1/OpenRTM-aist-Python: . installer/install_scripts

[openrtm ＠ openrtm.org]

Author: kawauchi
Date: 2015-10-22 15:05:38 +0900 (Thu, 22 Oct 2015)
New Revision: 619

Modified:
   tags/RELEASE_1_1_1/OpenRTM-aist-Python/
   tags/RELEASE_1_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
Log:
[compat,merge] r617 merged.


Property changes on: tags/RELEASE_1_1_1/OpenRTM-aist-Python
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610,614
   + /branches/RELENG_1_0/OpenRTM-aist-Python:345-404
/branches/RELENG_1_1/OpenRTM-aist-Python:396-478
/trunk/OpenRTM-aist-Python:498-500,502,511,543-547,559,563,565-568,570-586,591-605,607-610,614,617

Modified: tags/RELEASE_1_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh
===================================================================
--- tags/RELEASE_1_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh	2015-10-22 06:03:10 UTC (rev 618)
+++ tags/RELEASE_1_1_1/OpenRTM-aist-Python/installer/install_scripts/pkg_install_python_fedora.sh	2015-10-22 06:05:38 UTC (rev 619)
@@ -23,6 +23,15 @@
 packages="$devel $omnipy $openrtm"
 u_packages="$omnipy $openrtm "
 
+#---------------------------------------
+# yum / dnf コマンド切替え
+#---------------------------------------
+if [ $version_num -ge 22 ]; then
+    COMMAND="dnf"
+else
+    COMMAND="yum"
+fi
+
 #----------------------------------------
 # root かどうかをチェック
 #----------------------------------------
@@ -96,12 +105,12 @@
 
 	    if test "x$ins" = "x"; then
 		echo "Now installing: " $p
-		yum install $p
+		$COMMAND install $p
 		echo "done."
 		echo ""
 	    else  
 		if echo "$ins" |grep -q '0.4.2-0' ; then
-			yum install $p
+			$COMMAND install $p
 			echo "done." 
 			echo ""
 	       else 
@@ -130,7 +139,7 @@
 uninstall_packages () {
     for p in $*; do
 	echo "Now uninstalling: " $p
-	yum erase $p
+	$COMMAND erase $p
 	echo "done."
 	echo ""
     done