Author: nextgens
Date: 2007-01-03 15:37:38 +0000 (Wed, 03 Jan 2007)
New Revision: 11559
Modified:
trunk/apps/new_installer/res/unix/bin/1run.sh
Log:
new_installer: simplify the script ; thanks to aga for suggesting improvments
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/1run.sh 2007-01-03 14:52:23 UTC
(rev 11558)
+++ trunk/apps/new_installer/res/unix/bin/1run.sh 2007-01-03 15:37:38 UTC
(rev 11559)
@@ -1,15 +1,8 @@
#!/bin/sh
-if test $DST
-then
- DST="$INSTALL_PATH"
-else
- echo "Installing from tarball"
- DST="."
-fi
+INSTALL_PATH=${INSTALL_PATH:-$PWD}
-echo "Installing freenet in $INSTALL_PATH"
-cd "$DST"
+cd $INSTALL_PATH
if test -s freenet-ext.jar
then
echo "This script isn't meant to be used more than once."
@@ -93,13 +86,13 @@
echo -e "console.enabled=true\nconsole.port=$CONSOLE_PORT" >> freenet.ini
echo "Downloading freenet-stable-latest.jar"
-java -jar bin/sha1test.jar freenet-stable-latest.jar "$DST" &>/dev/null ||
exit 1
+java -jar bin/sha1test.jar freenet-stable-latest.jar $INSTALL_PATH &>/dev/null
|| exit 1
ln -s freenet-stable-latest.jar freenet.jar
echo "Downloading freenet-ext.jar"
-java -jar bin/sha1test.jar freenet-ext.jar "$DST" &>/dev/null || exit 1
+java -jar bin/sha1test.jar freenet-ext.jar $INSTALL_PATH &>/dev/null || exit 1
echo "Downloading update.sh"
-java -jar bin/sha1test.jar update/update.sh "$DST" &>/dev/null || exit 1
-chmod +x $DST/update.sh
+java -jar bin/sha1test.jar update/update.sh $INSTALL_PATH &>/dev/null || exit 1
+chmod +x $INSTALL_PATH/update.sh
# Starting the node up
./run.sh start
@@ -130,7 +123,7 @@
echo "Starting up a browser"
java -cp bin/browser.jar BareBonesBrowserLaunch
"http://127.0.0.1:$FPROXY_PORT/";
-java -cp bin/browser.jar BareBonesBrowserLaunch
"file:///$INSTALL_PATH/welcome.html"
+java -cp bin/browser.jar BareBonesBrowserLaunch
"file://$INSTALL_PATH/welcome.html"
echo "Finished"
