diff --git a/Output/ZeroNetInstaller.exe b/Output/ZeroNetInstaller.exe index e19d907..598ade1 100644 Binary files a/Output/ZeroNetInstaller.exe and b/Output/ZeroNetInstaller.exe differ diff --git a/ZeroBundle/ZeroNet.cmd b/ZeroBundle/ZeroNet.cmd index 376b898..a7a3254 100644 --- a/ZeroBundle/ZeroNet.cmd +++ b/ZeroBundle/ZeroNet.cmd @@ -1,4 +1,5 @@ @echo off +cd %~dp0 if "%1" == "" ( Python\python.exe -m zerobundle.run https://github.com/HelloZeroNet/ZeroNet start.py ) else ( diff --git a/ZeroBundle/ZeroNet.ico b/ZeroBundle/ZeroNet.ico new file mode 100644 index 0000000..bb4e2bb Binary files /dev/null and b/ZeroBundle/ZeroNet.ico differ diff --git a/ZeroNet-win-dist/meek-client.ico b/ZeroNet-win-dist/meek-client.ico new file mode 100644 index 0000000..4733f1d Binary files /dev/null and b/ZeroNet-win-dist/meek-client.ico differ diff --git a/ZeroNet-win-dist/obfs4proxy.ico b/ZeroNet-win-dist/obfs4proxy.ico new file mode 100644 index 0000000..4733f1d Binary files /dev/null and b/ZeroNet-win-dist/obfs4proxy.ico differ diff --git a/ZeroNet-win-dist/openssl.ico b/ZeroNet-win-dist/openssl.ico new file mode 100644 index 0000000..4733f1d Binary files /dev/null and b/ZeroNet-win-dist/openssl.ico differ diff --git a/ZeroNet-win-dist/tor.ico b/ZeroNet-win-dist/tor.ico new file mode 100644 index 0000000..4733f1d Binary files /dev/null and b/ZeroNet-win-dist/tor.ico differ diff --git a/ZeroNetInstaller.iss b/ZeroNetInstaller.iss index 58f6a7f..57d4534 100644 --- a/ZeroNetInstaller.iss +++ b/ZeroNetInstaller.iss @@ -69,11 +69,11 @@ Source: "Plugins\P2P-messages\*"; DestDir: "{app}\ZeroNet\plugins\P2P-messages"; [Icons] Name: "{group}\Data directory"; Filename: "{app}\ZeroNet\data"; Flags: foldershortcut -Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; \ +Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; IconFilename: "{app}\ZeroNet.ico"; \ AfterInstall: SetElevationBit('{group}\{#MyAppName}.lnk') Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}" Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}" -Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; \ +Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon; IconFilename: "{app}\ZeroNet.ico"; \ AfterInstall: SetElevationBit('{commondesktop}\{#MyAppName}.lnk') [Run] @@ -89,9 +89,9 @@ Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environmen ValueType: String; ValueName: "ZERONET_BUNDLE_ROOT"; ValueData: "{app}"; Flags: uninsdeletekeyifempty uninsdeletevalue; Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ ValueType: String; ValueName: "ZERONET_DATA_DIR"; ValueData: "{app}\ZeroNet\data"; Flags: uninsdeletekeyifempty uninsdeletevalue; -; Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ - ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}\bin"; \ - Check: NeedsAddPath(ExpandConstant('{app}\bin')) +Root: HKLM; Subkey: "SYSTEM\CurrentControlSet\Control\Session Manager\Environment"; \ + ValueType: expandsz; ValueName: "Path"; ValueData: "{olddata};{app}"; \ + Check: NeedsAddPath(ExpandConstant('{app}')) [InstallDelete] ; Delete files from old installation, version 1.2 and below