Author: nextgens Date: 2008-05-29 04:33:02 +0000 (Thu, 29 May 2008) New Revision: 20125
Modified: trunk/apps/new_installer/res/unix/bin/1run.sh trunk/apps/new_installer/res/unix/bin/cleanup.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_freenet-ext.sh trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh trunk/apps/new_installer/res/unix/bin/install_frost.sh trunk/apps/new_installer/res/unix/bin/install_jSite.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_startup_hook-mac.sh trunk/apps/new_installer/res/unix/bin/install_stun.sh trunk/apps/new_installer/res/unix/bin/install_thaw.sh trunk/apps/new_installer/res/unix/bin/install_thingamablog.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 Log: new_installer: maybe fix the bug related to the installer corrupting the files if previous/next were pressed Modified: trunk/apps/new_installer/res/unix/bin/1run.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/1run.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/1run.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" echo "fproxy.enablePersistentConnections=true" >> freenet.ini Modified: trunk/apps/new_installer/res/unix/bin/cleanup.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/cleanup.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/cleanup.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,10 +1,11 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" -rm -f "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 +rm -f "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH/bin" # We keep application installers in case users want to perform updates rm -f 1run.sh cleanup.sh detect_port_availability.sh setup.sh offline install_*.sh +touch "$INSTALL_PATH/.isInstalled" echo "All done, please click Next" Modified: trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/detect_port_availability.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" echo "Detecting tcp-ports availability..." Modified: trunk/apps/new_installer/res/unix/bin/install_autostart.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_autostart.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_autostart.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" # FIXME if we are running as root, and they are installed use the LSB utilities, with crontab as a fallback. Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_freenet-ext.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test ! -e offline Modified: trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_freenet-stable-latest.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test ! -e offline Modified: trunk/apps/new_installer/res/unix/bin/install_frost.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_frost.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e frost.install Modified: trunk/apps/new_installer/res/unix/bin/install_jSite.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_jSite.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e jsite.install Modified: trunk/apps/new_installer/res/unix/bin/install_librarian.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_librarian.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e xmllibrarian -a -e plug Modified: trunk/apps/new_installer/res/unix/bin/install_mdns.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_mdns.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e mdns -a -e plug Modified: trunk/apps/new_installer/res/unix/bin/install_opennet.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_opennet.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e opennet.install Modified: trunk/apps/new_installer/res/unix/bin/install_plugins.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_plugins.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e plug Modified: trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_startup_hook-mac.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -12,7 +12,7 @@ SCRIPT="$STARTUP_PATH/Freenet/Freenet.sh" SCRIPT_PLIST="$STARTUP_PATH/Freenet/Freenet.plist" -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" echo "Creating a startup script for Freenet" Modified: trunk/apps/new_installer/res/unix/bin/install_stun.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_stun.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e stun -a -e plug Modified: trunk/apps/new_installer/res/unix/bin/install_thaw.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_thaw.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e thaw.install Modified: trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_thingamablog.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e thingamablog.install Modified: trunk/apps/new_installer/res/unix/bin/install_updater.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_updater.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" # Tweak freenet.ini before the first startup Modified: trunk/apps/new_installer/res/unix/bin/install_upnp.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/install_upnp.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -1,6 +1,6 @@ #!/bin/sh -. "$HOME/_install_toSource.sh" +. "$HOME/_install_toSource.sh"|| exit 0 cd "$INSTALL_PATH" if test -e upnp -a -e plug Modified: trunk/apps/new_installer/res/unix/bin/setup.sh =================================================================== --- trunk/apps/new_installer/res/unix/bin/setup.sh 2008-05-29 04:13:28 UTC (rev 20124) +++ trunk/apps/new_installer/res/unix/bin/setup.sh 2008-05-29 04:33:02 UTC (rev 20125) @@ -5,6 +5,7 @@ echo INSTALL_PATH=\"$INSTALL_PATH\" >> "$HOME/_install_toSource.sh" echo JOPTS=\" -Djava.net.preferIPv4Stack=true \" >> "$HOME/_install_toSource.sh" echo ISO3_LANG=\"$ISO3_LANG\" >> "$HOME/_install_toSource.sh" +echo "if test -f \"$INSTALL_PATH/.isInstalled\"; then exit 1; fi" >> "$HOME/_install_toSource.sh" chmod 755 "$HOME/_install_toSource.sh" alias .= @@ -12,8 +13,9 @@ if test -s freenet.ini then - echo "This script isn't meant to be used more than once. I will rename your freenet.ini to freenet.old.ini and go on, but don't complain if it breaks\!" - mv freenet.ini freenet.old.ini + echo "The installer isn\'t meant to run more than once in the same directory" + touch .isInstalled + exit 0 fi # Hack to use a generic template for plugins
