[openrtm-commit:01471] r2574 - trunk/OpenRTM-aist/build

[openrtm ＠ openrtm.org]

Author: n-ando
Date: 2014-09-20 10:16:32 +0900 (Sat, 20 Sep 2014)
New Revision: 2574

Modified:
   trunk/OpenRTM-aist/build/pkg_install100_vine.sh
   trunk/OpenRTM-aist/build/pkg_install_debian.sh
   trunk/OpenRTM-aist/build/pkg_install_fedora.sh
   trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
Log:
[compat,installer,->RELENG_1_1] check_reposervers now does not exit under proxy environment. refs #2801

Modified: trunk/OpenRTM-aist/build/pkg_install100_vine.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install100_vine.sh	2014-07-30 06:13:50 UTC (rev 2573)
+++ trunk/OpenRTM-aist/build/pkg_install100_vine.sh	2014-09-20 01:16:32 UTC (rev 2574)
@@ -18,7 +18,8 @@
 # リポジトリサーバ
 #---------------------------------------
 openrtm_repo="rpm     http://$reposerver/pub/Linux/Vine/apt $vinever/\$(ARCH) main"
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
 reposerver=""
 
 #---------------------------------------
@@ -66,7 +67,8 @@
     done
     if test "x$nearhost" = "x"; then
 	echo "Repository servers unreachable.", $hosts
-	exit 1
+	echo "Check your internet connection. (or are you using proxy?)"
+    nearhost=$default_reposerver
     fi
     reposerver=$nearhost
 }

Modified: trunk/OpenRTM-aist/build/pkg_install_debian.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_debian.sh	2014-07-30 06:13:50 UTC (rev 2573)
+++ trunk/OpenRTM-aist/build/pkg_install_debian.sh	2014-09-20 01:16:32 UTC (rev 2574)
@@ -27,7 +27,8 @@
 packages="$devel $omni $pyyaml $openrtm"
 u_packages="$omni $ace $openrtm "
 
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
 reposerver=""
 }
 
@@ -112,7 +113,8 @@
     done
     if test "x$nearhost" = "x"; then
 	echo "Repository servers unreachable.", $hosts
-	exit 1
+	echo "Check your internet connection. (or are you using proxy?)"
+    nearhost=$default_reposerver
     fi
     reposerver=$nearhost
 }

Modified: trunk/OpenRTM-aist/build/pkg_install_fedora.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_fedora.sh	2014-07-30 06:13:50 UTC (rev 2573)
+++ trunk/OpenRTM-aist/build/pkg_install_fedora.sh	2014-09-20 01:16:32 UTC (rev 2574)
@@ -29,7 +29,8 @@
 devel="gcc-c++ uuid-devel libuuid-devel"
 packages="$devel $omni $openrtm"
 
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
 reposerver=""
 
 #----------------------------------------
@@ -75,7 +76,8 @@
     done
     if test "x$nearhost" = "x"; then
 	echo "Repository servers unreachable.", $hosts
-	exit 1
+    echo "Check your internet connection. (or are you using proxy?)"
+    nearhost=$default_reposerver
     fi
     reposerver=$nearhost
 }

Modified: trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh
===================================================================
--- trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh	2014-07-30 06:13:50 UTC (rev 2573)
+++ trunk/OpenRTM-aist/build/pkg_install_ubuntu.sh	2014-09-20 01:16:32 UTC (rev 2574)
@@ -14,12 +14,13 @@
 omni="libomniorb4 libomniorb4-dev omniidl4 omniorb4-nameserver omniidl omniorb-nameserver"
 ace="libace libace-dev"
 openrtm="openrtm-aist openrtm-aist-doc openrtm-aist-dev openrtm-aist-example python-yaml"
-openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1 python-yaml" 
+openrtm04="openrtm-aist=0.4.2-1 openrtm-aist-doc=0.4.2-1 openrtm-aist-dev=0.4.2-1 openrtm-aist-example=0.4.2-1 python-yaml"
 devel="gcc g++ make uuid-dev libboost-filesystem-dev"
 packages="$devel $omni $openrtm"
 u_packages="$omni $ace $openrtm "
 
-reposervers="www.openrtm.org www.openrtm.de"
+default_reposerver="openrtm.org"
+reposervers="openrtm.org"
 reposerver=""
 
 #---------------------------------------
@@ -78,7 +79,8 @@
     done
     if test "x$nearhost" = "x"; then
 	echo "Repository servers unreachable.", $hosts
-	exit 1
+	echo "Check your internet connection. (or are you using proxy?)"
+	nearhost=$default_reposerver
     fi
     reposerver=$nearhost
 }