summaryrefslogtreecommitdiff
path: root/FS-Test/bin/freeside-test-start
diff options
context:
space:
mode:
Diffstat (limited to 'FS-Test/bin/freeside-test-start')
-rwxr-xr-xFS-Test/bin/freeside-test-start9
1 files changed, 6 insertions, 3 deletions
diff --git a/FS-Test/bin/freeside-test-start b/FS-Test/bin/freeside-test-start
index cfa1adbc5..3ab8221b9 100755
--- a/FS-Test/bin/freeside-test-start
+++ b/FS-Test/bin/freeside-test-start
@@ -4,12 +4,15 @@ VERSION='3.8.1'
set -ae
+# get the parent directory of bin/(this script)
+testroot=$( dirname ${BASH_SOURCE[0]} )
+testroot=$( cd $testroot; cd ..; pwd )
+
echo "Stopping services."
sudo service freeside stop
sudo service apache2 stop
newname=freeside_`date +%Y%m%d`
-sharedir=$(perl -MFS::Test -e "print FS::Test::share_dir()")
# get company_name from existing DB, strip whitespace
# (if there is no existing DB, continue anyway)
@@ -34,7 +37,7 @@ fi
if [ $createdb = YES ]; then
echo "Creating new database from stock schema."
createdb --owner=freeside freeside
- sudo -u freeside psql freeside -q -f $sharedir/test.sql > /dev/null
+ sudo -u freeside psql freeside -q -f $testroot/share/test.sql > /dev/null
fi
if [ -f /usr/local/etc/freeside/htpasswd ]; then
@@ -44,7 +47,7 @@ if [ -f /usr/local/etc/freeside/htpasswd ]; then
fi
echo "Installing new htpasswd."
-sudo cp $sharedir/htpasswd /usr/local/etc/freeside/htpasswd
+sudo cp $testroot/share/htpasswd /usr/local/etc/freeside/htpasswd
newtime=$(sudo -u freeside \
psql -tc 'SELECT to_timestamp(max(_date) + 86400) FROM cust_bill' \