diff --git a/CLIENT_DATA/setup32.ins b/CLIENT_DATA/setup32.ins index 2e89d2d..033e70a 100644 --- a/CLIENT_DATA/setup32.ins +++ b/CLIENT_DATA/setup32.ins @@ -91,28 +91,23 @@ copy "%ScriptPath%\X86\addons.exe" "$LogDir$\$ProductId$" cd %SystemDrive% cd "$LogDir$\$ProductId$" addons.exe -mkdir "$InstallDir$\distribution" -mkdir "$InstallDir$" -move "$LogDir$\$ProductId$\Extract\Addons\extensions" "$InstallDir$\extensions" rem Original Install routine REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 /f "$InstallExe$" -ms "%ProgramFiles32Dir%\Mozilla Maintenance Service\uninstall.exe" /S -rem Move thia after install -move "$LogDir$\$ProductId$\Extract\Addons\bundles" "$InstallDir$\distribution\bundles" rem Cleanup temporary extract folder -cd "$LogDir$" -rmdir /S /Q "$LogDir$\$ProductId$" +rem cd "$LogDir$" +rem rmdir /S /Q "$LogDir$\$ProductId$" [Files_install] ; copy the ini file to the InstallDir copy "$IniCfgFile$" "$InstallDir$" copy "%ScriptPath%\*.cfg" "$InstallDir$" -copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" -; copy -s "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" -; copy -s "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions" +; copy "%ScriptPath%\local-settings.js" "$InstallDir$\defaults\pref" +copy -s "$LogDir$\$ProductId$\Extract\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" +copy -s "$LogDir$\$ProductId$\Extract\Addons\extensions\*.*" "$InstallDir$\extensions" del "$InstallDir$\distribution\extensions\tbtestpilot@labs.mozilla.com.xpi"