aboutsummaryrefslogtreecommitdiff
path: root/sources/potlatch
diff options
context:
space:
mode:
authorJochen Topf <jochen@topf.org>2013-01-22 21:59:34 +0100
committerJochen Topf <jochen@topf.org>2013-01-22 21:59:34 +0100
commitcf2345f0b143f6164f6bf35ac168d64a52db1951 (patch)
treebf1e2ffbee03fce405e0c3b1c3fa7d7c2c7d5283 /sources/potlatch
parentfedae9468d974361783d6bd67fb05b353ac6c159 (diff)
downloadtaginfo-cf2345f0b143f6164f6bf35ac168d64a52db1951.tar
taginfo-cf2345f0b143f6164f6bf35ac168d64a52db1951.tar.gz
Allow overriding of ruby version in update scripts
Diffstat (limited to 'sources/potlatch')
-rwxr-xr-xsources/potlatch/update.sh8
1 files changed, 7 insertions, 1 deletions
diff --git a/sources/potlatch/update.sh b/sources/potlatch/update.sh
index a2ebcf7..35e1776 100755
--- a/sources/potlatch/update.sh
+++ b/sources/potlatch/update.sh
@@ -18,6 +18,12 @@ fi
echo "`$DATECMD` Start potlatch..."
+EXEC_RUBY="$TAGINFO_RUBY"
+if [ "x$EXEC_RUBY" = "x" ]; then
+ EXEC_RUBY=ruby
+fi
+echo "Running with ruby set as '${EXEC_RUBY}'"
+
DATABASE=$DIR/taginfo-potlatch.db
rm -f $DATABASE
@@ -38,7 +44,7 @@ echo "`$DATECMD` Running pre.sql..."
sqlite3 $DATABASE <pre.sql
echo "`$DATECMD` Running import..."
-./import_potlatch.rb $DIR
+$EXEC_RUBY ./import_potlatch.rb $DIR
echo "`$DATECMD` Running post.sql..."
sqlite3 $DATABASE <post.sql