summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgebele <gebele@in-silico.ch>2013-10-15 17:31:40 +0200
committergebele <gebele@in-silico.ch>2013-10-15 17:31:40 +0200
commit2d1f8eb50d63a2b05540bf347033f1ef14554487 (patch)
tree5d8c2d08b1ce6ad30e019e65f3060980adbaf217
parentfb61d5bb3403572b004483bcdd9c1638c73397ab (diff)
parent0ec635fcf38f74d38ded51ffedd7fb8b3744002d (diff)
Merge branch 'development' of github.com:opentox/install into development
-rwxr-xr-xbase-install15
1 files changed, 14 insertions, 1 deletions
diff --git a/base-install b/base-install
index 326a908..7912e5d 100755
--- a/base-install
+++ b/base-install
@@ -21,12 +21,25 @@ echo
echo "Updating index..."
cmd="$WGET -O redland_key.asc $REDLAND_APT_KEY >/dev/null 2>&1" && run_cmd "$cmd" "Download redland apt-key"
-cmd="$APT_KEY add redland_key.asc >/dev/null 2>&1; rm redland_key.asc" && run_cmd "$cmd" "Adding redland apt-key"
+cmd="sudo $APT_KEY add redland_key.asc >/dev/null 2>&1; rm redland_key.asc" && run_cmd "$cmd" "Adding redland apt-key"
if ! cat "/etc/apt/sources.list" | grep "$REDLAND_DEB">/dev/null 2>&1; then
echo "deb $REDLAND_DEB ./" | sudo $TEE -a /etc/apt/sources.list >/dev/null
echo "deb-src $REDLAND_DEB ./" | sudo $TEE -a /etc/apt/sources.list >/dev/null
fi
+#Only for ist nightly test server (3)
+case "`hostname`" in
+"istnightly3" )
+ FTP_DEB="http://ftp.de.debian.org/debian/"
+ if ! cat "/etc/apt/sources.list" | grep "$FTP_DEB">/dev/null 2>&1; then
+ echo "deb $FTP_DEB wheezy main" | sudo $TEE -a /etc/apt/sources.list >/dev/null
+ echo "deb-src $FTP_DEB wheezy main" | sudo $TEE -a /etc/apt/sources.list >/dev/null
+ fi
+ sudo sed -i "s;deb http://http.debian.net/debian wheezy-updates main;#deb http://http.debian.net/debian wheezy-updates main;" /etc/apt/sources.list
+ sudo sed -i "s;deb-src http://http.debian.net/debian wheezy-updates main;#deb-src http://http.debian.net/debian wheezy-updates main;" /etc/apt/sources.list;;
+*) ;;
+esac
+
sudo $APTITUDE update -y >/dev/null 2>&1
sudo $APTITUDE upgrade -y >/dev/null 2>&1