Author: nextgens
Date: 2008-07-23 20:00:30 +0000 (Wed, 23 Jul 2008)
New Revision: 21350
Modified:
trunk/apps/new_installer/res/unix/bin/browse.sh
trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
trunk/apps/new_installer/res/unix/bin/install_autostart.sh
trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
trunk/apps/new_installer/res/unix/bin/install_librarian.sh
trunk/apps/new_installer/res/unix/bin/install_mdns.sh
trunk/apps/new_installer/res/unix/bin/install_opennet.sh
trunk/apps/new_installer/res/unix/bin/install_plugins.sh
trunk/apps/new_installer/res/unix/bin/install_stun.sh
trunk/apps/new_installer/res/unix/bin/install_updater.sh
trunk/apps/new_installer/res/unix/bin/install_upnp.sh
trunk/apps/new_installer/res/unix/bin/setup.sh
trunk/apps/new_installer/scripts/update.sh
Log:
new_installer: replace all test -e by test -f
Modified: trunk/apps/new_installer/res/unix/bin/browse.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/browse.sh 2008-07-23 16:45:55 UTC
(rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/browse.sh 2008-07-23 20:00:30 UTC
(rev 21350)
@@ -34,7 +34,7 @@
fi
}
-if test -e firefox.location
+if test -f firefox.location
then
"`cat firefox.location`" "file://$INSTALL_PATH/dont-close-me.html" &
browseURL "$URL"
Modified: trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2008-07-23 16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh
2008-07-23 20:00:30 UTC (rev 21350)
@@ -38,7 +38,7 @@
chmod u+rx bin/*sh
- if test -e firefox_profile/user.js
+ if test -f firefox_profile/user.js
then
cat firefox_profile/user.js | sed "s/8888/$FPROXY_PORT/g"
>user.js.tmp
mv user.js.tmp firefox_profile/user.js
@@ -50,7 +50,7 @@
# Translate if needed
FILE="dont-close-me.html"
-if test -e dont-close-me.$ISO3_LANG.html
+if test -f dont-close-me.$ISO3_LANG.html
then
FILE="dont-close-me.$ISO3_LANG.html"
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_autostart.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_autostart.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_autostart.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -7,7 +7,7 @@
# See here:
#
http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/initsrcinstrm.html
#
http://refspecs.linux-foundation.org/LSB_3.2.0/LSB-Core-generic/LSB-Core-generic/useradd.html
-if test -e autostart.install
+if test -f autostart.install
then
echo "Enabling auto-start."
if test -x `which crontab`
Modified: trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
2008-07-23 16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_firefox_profile.sh
2008-07-23 20:00:30 UTC (rev 21350)
@@ -3,7 +3,7 @@
. "$HOME/_install_toSource.sh" || exit 0
cd "$INSTALL_PATH"
-if test -e firefox_profile.install
+if test -f firefox_profile.install
then
echo "Downloading the custom firefox profile"
if test ! -e offline
Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -3,14 +3,14 @@
. "$HOME/_install_toSource.sh" || exit 0
cd "$INSTALL_PATH"
-if test -e xmllibrarian -a -e plug
+if test -f xmllibrarian -a -f plug
then
echo "Enabling the XMLLibrarian plugin"
if test ! -e plugins; then mkdir plugins; fi
PLUGINS="`cat plug`"
echo "XMLLibrarian;$PLUGINS" > plug2
mv -f plug2 plug
- if test ! -e offline
+ if test ! -f offline
then
java $JOPTS -jar bin/sha1test.jar XMLLibrarian.jar plugins
"$CAFILE" >/dev/null 2>&1
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -3,7 +3,7 @@
. "$HOME/_install_toSource.sh" || exit 0
cd "$INSTALL_PATH"
-if test -e mdns -a -e plug
+if test -f mdns -a -e plug
then
echo "Enabling the MDNSDiscovery plugin"
if test ! -e plugins; then mkdir plugins; fi 2>&1 >/dev/null
Modified: trunk/apps/new_installer/res/unix/bin/install_opennet.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -3,7 +3,7 @@
. "$HOME/_install_toSource.sh" || exit 0
cd "$INSTALL_PATH"
-if test -e opennet.install
+if test -f opennet.install
then
rm -f opennet.install
if test ! -e offline
Modified: trunk/apps/new_installer/res/unix/bin/install_plugins.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -3,7 +3,7 @@
. "$HOME/_install_toSource.sh" || exit 0
cd "$INSTALL_PATH"
-if test -e plug
+if test -f plug
then
# Register plugins
echo "pluginmanager.loadplugin=`cat plug`" >> freenet.ini
Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -3,7 +3,7 @@
. "$HOME/_install_toSource.sh" || exit 0
cd "$INSTALL_PATH"
-if test -e stun -a -e plug
+if test -f stun -a -e plug
then
echo "Enabling the STUN plugin"
if test ! -e plugins; then mkdir plugins; fi
Modified: trunk/apps/new_installer/res/unix/bin/install_updater.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -5,7 +5,7 @@
# Tweak freenet.ini before the first startup
echo "node.updater.enabled=true" > freenet.ini
-if test -e update
+if test -f update
then
echo "Enabling the auto-update feature"
echo "node.updater.autoupdate=true" >> freenet.ini
@@ -18,7 +18,7 @@
java $JOPTS -jar bin/sha1test.jar update.sh ./ "$CAFILE" >/dev/null
2>&1 || exit 1
fi
-if test -e update.sh
+if test -f update.sh
then
chmod a+rx update.sh
fi
Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-07-23
16:45:55 UTC (rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-07-23
20:00:30 UTC (rev 21350)
@@ -3,7 +3,7 @@
. "$HOME/_install_toSource.sh" || exit 0
cd "$INSTALL_PATH"
-if test -e upnp -a -e plug
+if test -f upnp -a -e plug
then
echo "Enabling the UP&P plugin"
if test ! -e plugins; then mkdir plugins; fi
Modified: trunk/apps/new_installer/res/unix/bin/setup.sh
===================================================================
--- trunk/apps/new_installer/res/unix/bin/setup.sh 2008-07-23 16:45:55 UTC
(rev 21349)
+++ trunk/apps/new_installer/res/unix/bin/setup.sh 2008-07-23 20:00:30 UTC
(rev 21350)
@@ -8,7 +8,7 @@
cd "$INSTALL_PATH"
rm -f "$HOME/_install_toSource.sh"
-if test -e "$HOME/_install_toSource.sh"
+if test -f "$HOME/_install_toSource.sh"
then
echo "Please delete the freenet directory and the file
\"$HOME/_install_toSource.sh\" before restarting the installer."
touch .isInstalled
@@ -44,7 +44,7 @@
touch plug
# Are we in offline mode ?
-if test -e offline
+if test -f offline
then
echo "Offline installation mode"
else
Modified: trunk/apps/new_installer/scripts/update.sh
===================================================================
--- trunk/apps/new_installer/scripts/update.sh 2008-07-23 16:45:55 UTC (rev
21349)
+++ trunk/apps/new_installer/scripts/update.sh 2008-07-23 20:00:30 UTC (rev
21350)
@@ -19,7 +19,7 @@
file_exist () {
if test -n "$1" -a -n "$2"
then
- if test -e "$1" -a -e "$2"
+ if test -f "$1" -a -f "$2"
then
return 0
fi
