Author: nextgens Date: 2008-05-29 12:28:27 +0000 (Thu, 29 May 2008) New Revision: 20129
Modified: trunk/apps/new_installer/res/windows/bin/cleanup.cmd trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd trunk/apps/new_installer/res/windows/bin/install_frost.cmd trunk/apps/new_installer/res/windows/bin/install_jsite.cmd trunk/apps/new_installer/res/windows/bin/install_opennet.cmd trunk/apps/new_installer/res/windows/bin/install_plugins.cmd trunk/apps/new_installer/res/windows/bin/install_thaw.cmd trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd trunk/apps/new_installer/res/windows/bin/install_updater.cmd trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd trunk/apps/new_installer/res/windows/bin/setup.cmd trunk/apps/new_installer/res/windows/bin/start.cmd trunk/apps/new_installer/res/windows/bin/stop.cmd Log: new_installer: maybe fix the bug related to the installer corrupting the files if previous/next were pressed (windows part) Modified: trunk/apps/new_installer/res/windows/bin/cleanup.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/cleanup.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/cleanup.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,9 +2,11 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end :: Keep application installers in case users want to perform updates @cd bin @del /F 1run.cmd setup.cmd detect_port_availability.cmd install_freenet-ext.cmd install_freenet-stable-latest.cmd install_plugins.cmd install_updater.cmd install_wrapper.cmd setup.cmd opennet.install offline install_frost.cmd 2> NUL > NUL + at echo DONE> .isInstalled @echo All done, please click Next Modified: trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_freenet-ext.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @if exist offline goto end @echo Downloading freenet-ext.jar Modified: trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_freenet-stable-latest.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,9 +2,11 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end - at if exist offline goto end + at if exist offline goto end1 @echo Downloading freenet-stable-latest.jar @java -jar bin\sha1test.jar freenet-stable-latest.jar . > NUL +:end1 + at copy freenet-stable-latest.jar freenet.jar > NUl :end - at copy freenet-stable-latest.jar freenet.jar > NUl Modified: trunk/apps/new_installer/res/windows/bin/install_frost.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_frost.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @if not exist frost.install goto nofrost @del /F frost.install > NUL @@ -13,3 +14,4 @@ @mkdir frost @java -jar bin\uncompress.jar frost.zip frost > NUL :nofrost +:end Modified: trunk/apps/new_installer/res/windows/bin/install_jsite.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_jsite.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @if not exist jsite.install goto nojsite @del /F jsite.install > NUL @@ -14,3 +15,4 @@ @echo @cd jSite > jsite.cmd @echo @start javaw -jar jSite.jar >> jsite.cmd :nojsite +:end Modified: trunk/apps/new_installer/res/windows/bin/install_opennet.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_opennet.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_opennet.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @if not exist opennet.install goto end @del /F opennet.install > NUL Modified: trunk/apps/new_installer/res/windows/bin/install_plugins.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_plugins.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_plugins.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @echo Setting up plugins @mkdir plugins 2> NUL @@ -52,3 +53,4 @@ :nolibrarian @echo pluginmanager.loadplugin=%PLUGINS% >> freenet.ini +:end Modified: trunk/apps/new_installer/res/windows/bin/install_thaw.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_thaw.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @if not exist thaw.install goto nothaw @del /F thaw.install > NUL @@ -15,3 +16,4 @@ @echo @cd Thaw >thaw.cmd @echo @start javaw -jar Thaw.jar >> thaw.cmd :nothaw +:end Modified: trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_thingamablog.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @if not exist thingamablog.install goto nothingamablog @del /F thingamablog.install > NUL @@ -14,3 +15,4 @@ @echo @cd thingamablog-testing > thingamablog.cmd @echo @start javaw -jar thingamablog.jar >> thingamablog.cmd :nothingamablog +:end Modified: trunk/apps/new_installer/res/windows/bin/install_updater.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_updater.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_updater.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @echo Downloading update.cmd @if exist offline goto end @@ -13,3 +14,4 @@ @echo node.updater.autoupdate=true>> freenet.ini @del /F update > NUL :noautoupdate +:end Modified: trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/install_wrapper.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,6 +2,7 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end @echo Detecting tcp port availability :: Try to detect a free, available port for fproxy @@ -118,3 +119,4 @@ @echo Spawning up a browser @browse welcome.html :endl10n +:end Modified: trunk/apps/new_installer/res/windows/bin/setup.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/setup.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/setup.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,13 +2,8 @@ @set INSTALL_PATH=$INSTALL_PATH @set JAVA_HOME=$JAVA_HOME @cd /D %INSTALL_PATH% + at if exist .isInstalled goto end - at if not exist freenet.ini goto nocleanup - at echo I found a freenet.ini file in the directory !!! it shouldn't exist! I will rename it to freenet.old.ini and go on but don't complain if it breaks : the installer is meant to be used in an empty directory! - at rename freenet.ini freenet.old.ini > NUL - at del /F freenet.ini > NUL -:nocleanup - @echo Registering .fref file extension @echo Windows Registry Editor Version 5.00 >> fref.reg @echo [HKEY_CLASSES_ROOT\.fref] >> fref.reg @@ -31,3 +26,4 @@ :: Are we in offline mode ? @if exist offline echo "Offline installation mode" +:end Modified: trunk/apps/new_installer/res/windows/bin/start.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/start.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/start.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,3 +2,4 @@ @set PATH=%SYSTEMROOT%\System32\;%PATH% @net start freenet-darknet @pause +:end Modified: trunk/apps/new_installer/res/windows/bin/stop.cmd =================================================================== --- trunk/apps/new_installer/res/windows/bin/stop.cmd 2008-05-29 06:18:34 UTC (rev 20128) +++ trunk/apps/new_installer/res/windows/bin/stop.cmd 2008-05-29 12:28:27 UTC (rev 20129) @@ -2,3 +2,4 @@ @set PATH=%SYSTEMROOT%\System32\;%PATH% @net stop freenet-darknet @pause +:end
