From 324012a2f65d9a6f16d39d414f712eb00d0c1549 Mon Sep 17 00:00:00 2001
From: kaloyane <kaloyane>
Date: Fri, 15 Jul 2011 15:56:17 +0000
Subject: [PATCH] minor: fix boot.sh so that it fetches the contents of the
entire "admin" folder including "post-install"
SVN: 22157
---
openbis/dist/admin/boot.sh | 5 -----
openbis/dist/admin/svn-update.sh | 4 ++--
screening/dist/admin/boot.sh | 1 -
screening/dist/admin/svn-update.sh | 2 +-
4 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/openbis/dist/admin/boot.sh b/openbis/dist/admin/boot.sh
index e72bf91b6b2..8ac8e39c701 100755
--- a/openbis/dist/admin/boot.sh
+++ b/openbis/dist/admin/boot.sh
@@ -45,11 +45,6 @@ cd bin
wget $SVN_DIR/svn-update.sh
wget $SVN_DIR/env
-# fetch screening specific file
-if [ "$SVN_DIR" == "$SVN_DIR_SCREENING" ]; then
- wget $SVN_DIR/empty-screening-database.sql
-fi
-
source ./svn-update.sh
diff --git a/openbis/dist/admin/svn-update.sh b/openbis/dist/admin/svn-update.sh
index 69d642969f4..bce4e7464d3 100755
--- a/openbis/dist/admin/svn-update.sh
+++ b/openbis/dist/admin/svn-update.sh
@@ -18,8 +18,8 @@ fi
WGET_HOME=`which wget`
# download the scripts
-$WGET_HOME --no-directories --directory-prefix $OPENBIS_HOME/bin --no-verbose -r -l1 -A.sh http://$SVN/
+$WGET_HOME -nH --cut-dirs=6 --directory-prefix $OPENBIS_HOME --no-verbose -r -l2 -A.{sh,sql}http://$SVN/
# set permissions
-find $OPENBIS_HOME/bin -type f -name "*.sh" -exec chmod 700 {} \;
+find $OPENBIS_HOME -type f -name "*.sh" -exec chmod 700 {} \;
diff --git a/screening/dist/admin/boot.sh b/screening/dist/admin/boot.sh
index 370aa61fd2e..245ed0e0009 100755
--- a/screening/dist/admin/boot.sh
+++ b/screening/dist/admin/boot.sh
@@ -7,6 +7,5 @@ mkdir bin
cd bin
wget $SVN_DIR/svn-update.sh
wget $SVN_DIR/env
-wget $SVN_DIR/empty-screening-database.sql
. ./svn-update.sh
cd ..
\ No newline at end of file
diff --git a/screening/dist/admin/svn-update.sh b/screening/dist/admin/svn-update.sh
index a6137ca1287..88d2f3e7524 100755
--- a/screening/dist/admin/svn-update.sh
+++ b/screening/dist/admin/svn-update.sh
@@ -18,7 +18,7 @@ fi
WGET_HOME=`which wget`
# download the scripts
-$WGET_HOME --no-directories --directory-prefix $OPENBIS_HOME --no-verbose -r -l1 -A.sh http://$SVN/
+$WGET_HOME -nH --cut-dirs=6 --directory-prefix $OPENBIS_HOME --no-verbose -r -l2 -A.{sh,sql}http://$SVN/
# set permissions
find $OPENBIS_HOME -type f -name "*.sh" -exec chmod 700 {} \;
--
GitLab