From a29e9088619aa7050eb547a06acf96ed4e05c907 Mon Sep 17 00:00:00 2001 From: Mario Fetka Date: Wed, 16 Oct 2013 14:14:31 +0200 Subject: [PATCH] intial commit waterfox with nsis installer --- CLIENT_DATA/defaultassociations.xml | 5 ++ CLIENT_DATA/delsub64.ins | 40 +++++----- CLIENT_DATA/opsi-waterfoxproject.waterfox.ini | 2 +- CLIENT_DATA/setup64.ins | 46 ++++-------- CLIENT_DATA/uninstall64.ins | 5 +- OPSI/changelog.txt | 2 - OPSI/control | 30 ++++---- Testing.txt | 28 ------- Waterfox-18.0.1-Setup.exe.sha1sum | 1 - Waterfox-24.0-Setup.exe.sha1sum | 1 + Waterfox-logo-300x300.png.sha1sum | 2 +- builder-product.cfg | 75 +++++++++---------- builder-targets-cb.sh | 25 +++---- fastdial@telega.phpnet.us.xpi.sha1sum | 2 +- firefox@ghostery.com.xpi.sha1sum | 2 +- langpack-de@firefox.mozilla.org.xpi.sha1sum | 1 - vlc-plugin@videolan.org.xpi.sha1sum | 1 + ...6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum | 2 +- ...4-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum | 2 +- ...A-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum | 2 +- ...f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum | 2 +- ...8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum | 2 +- ...b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum | 2 +- 23 files changed, 116 insertions(+), 164 deletions(-) create mode 100644 CLIENT_DATA/defaultassociations.xml delete mode 100644 Testing.txt delete mode 100644 Waterfox-18.0.1-Setup.exe.sha1sum create mode 100644 Waterfox-24.0-Setup.exe.sha1sum delete mode 100644 langpack-de@firefox.mozilla.org.xpi.sha1sum create mode 100644 vlc-plugin@videolan.org.xpi.sha1sum diff --git a/CLIENT_DATA/defaultassociations.xml b/CLIENT_DATA/defaultassociations.xml new file mode 100644 index 0000000..9db6af9 --- /dev/null +++ b/CLIENT_DATA/defaultassociations.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/CLIENT_DATA/delsub64.ins b/CLIENT_DATA/delsub64.ins index c7db77f..42aee14 100644 --- a/CLIENT_DATA/delsub64.ins +++ b/CLIENT_DATA/delsub64.ins @@ -4,43 +4,45 @@ ; credits: http://www.opsi.org/en/credits/ +Set $UninstallProgram$ = $InstallDir$ + "\" + $UninstallProg$ Set $IniFile$ = $InstallDir$ + "\opsi-" + $ProductId$ + ".ini" if FileExists($IniFile$) - Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","") - Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","") - Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","") + Set $OLD_VERSION$ = GetValueFromInifile($IniFile$,"COMMON","VERSION","") + Set $OLD_CREATOR_TAG$ = GetValueFromInifile($IniFile$,"COMMON","CREATOR_TAG","") + Set $OLD_RELEASE$ = GetValueFromInifile($IniFile$,"COMMON","RELEASE","") endif -Message "Uninstalling " + $ProductId$ + " "+ $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." +Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..." if FileExists($IniFile$) - Set $MsiIdOld$ = GetValueFromInifile($IniFile$,"X86_64","MsiId","{XXXXXXXX-XXXX-XXXX-XXXX-XXXXXXXXXXXX}") - if not (GetRegistryStringValue32("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiIdOld$ + "] DisplayName") = "") - comment "Old MSI id " + $MsiIdOld$ + " found in registry, starting msiexec to uninstall old version" - Winbatch_uninstall_msi_old - sub_check_exitcode - endif + Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe") + Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$ + if FileExists($UninstallProgramOld$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall_old /WaitforProcessending "Au_.exe" /Timeoutseconds 20 + sub_check_exitcode + endif endif -if not (GetRegistryStringValue64("[HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\" + $MsiId$ + "] DisplayName") = "") - comment "MSI id " + $MsiId$ + " found in registry, starting msiexec to uninstall" - Winbatch_uninstall_msi +if FileExists($UninstallProgram$) + comment "Uninstall program found, starting uninstall" + Winbatch_uninstall /WaitforProcessending "Au_.exe" /Timeoutseconds 20 sub_check_exitcode endif comment "Delete files" -Files_uninstall /64Bit +Files_uninstall /64bit comment "Cleanup registry" -Registry_uninstall /64Bit +Registry_uninstall /64bit comment "Delete program shortcuts" LinkFolder_uninstall -[Winbatch_uninstall_msi_old] -msiexec /x $MsiIdOld$ /qb! REBOOT=ReallySuppress +[Winbatch_uninstall_old] +"$UninstallProgramOld$" -ms -[Winbatch_uninstall_msi] -msiexec /x $MsiId$ /qb! REBOOT=ReallySuppress +[Winbatch_uninstall] +"$UninstallProgram$" -ms [Files_uninstall] ; Example for recursively deleting the installation directory: diff --git a/CLIENT_DATA/opsi-waterfoxproject.waterfox.ini b/CLIENT_DATA/opsi-waterfoxproject.waterfox.ini index 9555cf1..41585d5 100644 --- a/CLIENT_DATA/opsi-waterfoxproject.waterfox.ini +++ b/CLIENT_DATA/opsi-waterfoxproject.waterfox.ini @@ -1,4 +1,4 @@ -[X86_64] +[X86] [COMMON] PN=name diff --git a/CLIENT_DATA/setup64.ins b/CLIENT_DATA/setup64.ins index ba9c0d8..2566624 100644 --- a/CLIENT_DATA/setup64.ins +++ b/CLIENT_DATA/setup64.ins @@ -6,7 +6,8 @@ [Actions] requiredWinstVersion >= "4.11.2.6" -DefVar $MsiIdOld$ +DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ @@ -17,7 +18,6 @@ DefVar $ExitCode$ DefVar $OLD_VERSION$ DefVar $OLD_CREATOR_TAG$ DefVar $OLD_RELEASE$ -DefVar $RealInstallMsi$ ; DefVar $InstallDir$ DefVar $ProgExe$ @@ -34,27 +34,22 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; @@BUILDER_VARIABLES@@ - - - ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- ;$ProductId$ should be the name of the product in opsi ; therefore please: only lower letters, no umlauts, ; no white space use '-' as a seperator -Set $MinimumSpace$ = "100 MB" +Set $MinimumSpace$ = "200 MB" ; the path were we find the product after the installation -Set $InstallDir$ = "%ProgramFiles64Dir%\Waterfox" +Set $InstallDir$ = "%ProgramFiles64Dir%\Mozilla Waterfox" ; ---------------------------------------------------------------- -Set $RealInstallMsi$ = $LogDir$ + "\" + $ExtractDir$ + "\" + $InstallMsi$ - Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" if not(HasMinimumSpace ("%SystemDrive%", $MinimumSpace$)) LogError "Not enough space on %SystemDrive%, " + $MinimumSpace$ + " on drive %SystemDrive% needed for " + $ProductId$ - isFatalError + isFatalError "No Space" ; Stop process and set installation status to failed else comment "Show product picture" @@ -65,20 +60,18 @@ else Sub "%ScriptPath%\delsub64.ins" endif - Message "Installing " + $ProductId$ + " ..." + Message "Installing " + $ProductId$ + " "+ $VERSION$ + "-" + $CREATOR_TAG$ + $RELEASE$ + " ..." comment "Start setup program" ChangeDirectory "%SCRIPTPATH%" - Winbatch_extract - Sub_check_exitcode Winbatch_install Sub_check_exitcode comment create associations -; Set $InstallDir$ = $InstallDir32$ +; Set $InstallDir$ = $InstallDir64$ Set $ProgExe$ = $Prog64$ DosInAnIcon_install winst /Sysnative - + comment "Copy files" Files_install /64Bit @@ -87,7 +80,7 @@ else comment "Create shortcuts" LinkFolder_install - + endif [DosInAnIcon_install] @@ -118,7 +111,7 @@ FOR %%j IN (%Extn%) DO ( copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old" xml ed -d /DefaultAssociations/Association[@Identifier='%%A'] "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" copy "$LogDir$\defaultassociations.xml" "$LogDir$\defaultassociations.xml.old" - xml ed -s /DefaultAssociations -t elem -n Association_new -v "" -i /DefaultAssociations/Association_new -t attr -n Identifier -v %%A -i /DefaultAssociations/Association_new -t attr -n ProgId -v FirefoxURL -i /DefaultAssociations/Association_new -t attr -n ApplicationName -v "Waterfox" -r "/DefaultAssociations/Association_new" -v Association "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" + xml ed -s /DefaultAssociations -t elem -n Association_new -v "" -i /DefaultAssociations/Association_new -t attr -n Identifier -v %%A -i /DefaultAssociations/Association_new -t attr -n ProgId -v WaterfoxURL -i /DefaultAssociations/Association_new -t attr -n ApplicationName -v "Waterfox" -r "/DefaultAssociations/Association_new" -v Association "$LogDir$\defaultassociations.xml.old"> "$LogDir$\defaultassociations.xml" ) ) @@ -126,27 +119,18 @@ rem Set Default Associations for Windows 8 move "$LogDir$\defaultassociations.xml" "%System%" REG ADD HKLM\Software\Policies\Microsoft\Windows\System /V DefaultAssociationsConfiguration /D "%System%\defaultassociations.xml" /F -rem Special case for Waterfox -REG ADD %SC%\FirefoxURL\DefaultIcon /VE /D "$InstallDir$\%Prog%.exe,1" /F -REG ADD %SC%\FirefoxURL\shell\open\command /VE /D "\"%InstallDir%\%Prog%.exe\" -osint -url \"%%1\"" /F - -[Winbatch_extract] -"$InstallExe$" /extract:"$LogDir$" - [Winbatch_install] -msiexec /i "$RealInstallMsi$" /l* "$LogDir$\$ProductId$.install_log.txt" /qb ALLUSERS=1 REBOOT=ReallySuppress +REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1 /f +"$InstallExe$" -ms +"%ProgramFiles64Dir%\Mozilla Maintenance Service\uninstall.exe" /S [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_64\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" -copy -s "%ScriptPath%\X86_64\Addons\extensions\*.*" "$InstallDir$\extensions" - -; Example of recursively copying some files into the installation directory: -; -; copy -s "%ScriptPath%\files\*.*" "$InstallDir$" +copy -s "%ScriptPath%\X86\Addons\bundles\*.*" "$InstallDir$\distribution\bundles" +copy -s "%ScriptPath%\X86\Addons\extensions\*.*" "$InstallDir$\extensions" [Registry_install] ; Example of setting some values of an registry key: diff --git a/CLIENT_DATA/uninstall64.ins b/CLIENT_DATA/uninstall64.ins index 01c156e..abaccb9 100644 --- a/CLIENT_DATA/uninstall64.ins +++ b/CLIENT_DATA/uninstall64.ins @@ -6,7 +6,8 @@ [Actions] requiredWinstVersion >= "4.11.2.6" -DefVar $MsiIdOld$ +DefVar $UninstallProgram$ +DefVar $UninstallProgramOld$ DefVar $IniFile$ DefVar $IniCfgFile$ DefVar $LogDir$ @@ -32,7 +33,7 @@ Set $LogDir$ = "%SystemDrive%\tmp" ; ---------------------------------------------------------------- ; - Please edit the following values - ; ---------------------------------------------------------------- -Set $InstallDir$ = "%ProgramFiles64Dir%\Waterfox" +Set $InstallDir$ = "%ProgramFiles64Dir%\Mozilla Waterfox" ; ---------------------------------------------------------------- Set $IniCfgFile$ = "%ScriptPath%\opsi-" + $ProductId$ + ".ini" diff --git a/OPSI/changelog.txt b/OPSI/changelog.txt index bc69317..e69de29 100644 --- a/OPSI/changelog.txt +++ b/OPSI/changelog.txt @@ -1,2 +0,0 @@ -Don't add cahngelog entries here! -It get autogenerated by the opsi-builder.sh \ No newline at end of file diff --git a/OPSI/control b/OPSI/control index 847dbe0..b40ddda 100644 --- a/OPSI/control +++ b/OPSI/control @@ -1,16 +1,16 @@ [Package] -version: 2 +version: RELEASE depends: incremental: False [Product] type: localboot -id: opsi-template -name: opsi template product -description: A template for opsi products -advice: -version: 4.0.2 -priority: 0 +id: mozilla.firefox +name: Mozilla Firefox +description: Mozilla Firefox ist ein freier Webbrowser des Mozilla-Projekts. +advice: ADVICE +version: VERSION +priority: PRIORITY licenseRequired: False productClasses: setupScript: setup64.ins @@ -19,12 +19,14 @@ updateScript: alwaysScript: onceScript: customScript: -userLoginScript: - -[ProductDependency] -action: setup -requiredProduct: sereby.aio -requiredStatus: installed -requirementType: before +userLoginScript: +[ProductProperty] +type: unicode +name: install_architecture +multivalue: False +editable: False +description: which architecture (32/64 bit) has to be installed +values: ["32 only", "64 only", "both", "system specific"] +default: ["system specific"] diff --git a/Testing.txt b/Testing.txt deleted file mode 100644 index d6b5e6c..0000000 --- a/Testing.txt +++ /dev/null @@ -1,28 +0,0 @@ -*** Qualitiymanagement/Testing procedure - -- Product: - - Name: productname - - Version: xxx - - Release: yyyy - -- Environment - - OS: Native windows XP-32Bit installation - - Preinstalled packages: None (also no aio) - - Files used while testing: - File1: http://domain.de/file.ext - -- Testing process: - OPSI-action: - - Installation (without dependencies like AIO/Firefox): ?? - Result: - - File extensions related to program: ?? - - Start menu entry: ?? - - Starting/using program: viewer works, File1 is shown correctly: ?? - - OPSI-action: - - Uninstall - Result: - - File extensions related to program: unrelated: ?? - - Start menu entry: none: ?? - - diff --git a/Waterfox-18.0.1-Setup.exe.sha1sum b/Waterfox-18.0.1-Setup.exe.sha1sum deleted file mode 100644 index 77de76f..0000000 --- a/Waterfox-18.0.1-Setup.exe.sha1sum +++ /dev/null @@ -1 +0,0 @@ -58b6d2a0666cfb370c81063191600cc64d447ee5 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/Waterfox-18.0.1-Setup.exe diff --git a/Waterfox-24.0-Setup.exe.sha1sum b/Waterfox-24.0-Setup.exe.sha1sum new file mode 100644 index 0000000..f6b7012 --- /dev/null +++ b/Waterfox-24.0-Setup.exe.sha1sum @@ -0,0 +1 @@ +c74dbd24c9ba6bdafa37fc839651faf6ea3b6fd8 /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/Waterfox-24.0-Setup.exe diff --git a/Waterfox-logo-300x300.png.sha1sum b/Waterfox-logo-300x300.png.sha1sum index a0696fd..d48f144 100644 --- a/Waterfox-logo-300x300.png.sha1sum +++ b/Waterfox-logo-300x300.png.sha1sum @@ -1 +1 @@ -d26ff78bd6a4e3848d08fd13b372332a7c0849bf /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1//Waterfox-logo-300x300.png +d26ff78bd6a4e3848d08fd13b372332a7c0849bf /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0//Waterfox-logo-300x300.png diff --git a/builder-product.cfg b/builder-product.cfg index 294292d..fefa185 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -2,10 +2,10 @@ # Setup product information ############################ VENDOR="waterfoxproject.org" -PN="waterfoxproject.waterfox" +PN="waterfirefoxproject.waterfox" NAME="Waterfox" -DESCRIPTION="Waterfox is a high performance browser based on the Mozilla Firefox source code. Waterfox is specifically for 64-bit systems, with one thing in mind: speed." -VERSION="18.0.1" +DESCRIPTION="Waterfox is Firefox specifically for 64-bit systems, with one thing in mind: speed." +VERSION="24.0" RELEASE="1" PRIORITY="0" ADVICE="" @@ -20,76 +20,69 @@ DL_SOURCE[0]="http://www.berlios.de/wp-content/uploads/2013/01/Waterfox-logo-300 DL_FILE[1]="Waterfox-${VERSION}-Setup.exe" DL_SOURCE[1]="http://sourceforge.net/projects/waterfoxproj/files/Waterfox%20${VERSION}%20Setup.exe" -DL_ARCH[1]="X86_64" +DL_ARCH[1]="X86" DL_WINST_NAME[1]=InstallExe -DL_FILE[2]="langpack-de@firefox.mozilla.org.xpi" -DL_SOURCE[2]="https://addons.mozilla.org/firefox/downloads/file/187702/deutsch_de_language_pack-18.0-fx.xpi" -DL_ARCH[2]="X86_64" +DL_FILE[2]="vlc-plugin@videolan.org.xpi" +DL_SOURCE[2]="http://download.videolan.org/pub/videolan/vlc/last/win64/vlc-2.1.0.xpi" +DL_ARCH[2]="X86" DL_EXTRACT_TO[2]="Addons/bundles" -DL_WINST_NAME[2]=GermanLangugaPackXpi +DL_WINST_NAME[2]=VideolanClientXpi DL_FILE[3]="{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi" DL_SOURCE[3]="https://addons.mozilla.org/firefox/downloads/latest/1865/addon-1865-latest.xpi" -DL_ARCH[3]="X86_64" +DL_ARCH[3]="X86" DL_EXTRACT_TO[3]="Addons/bundles" DL_WINST_NAME[3]=AdblockPlusXpi - -DL_FILE[4]="firefox@ghostery.com.xpi" -DL_SOURCE[4]="https://addons.mozilla.org/firefox/downloads/latest/9609/addon-9609-latest.xpi" -DL_ARCH[4]="X86_64" -DL_EXTRACT_TO[4]="Addons/bundles" -DL_WINST_NAME[4]=GhosteryXpi - -DL_FILE[5]="fastdial@telega.phpnet.us.xpi" -DL_SOURCE[5]="http://www.userlogos.org/files/fast_dial-4.3.3-fx.xpi" -DL_ARCH[5]="X86_64" + +DL_FILE[4]="firefox@ghostery.com.xpi" +DL_SOURCE[4]="https://addons.mozilla.org/firefox/downloads/latest/9609/addon-9609-latest.xpi" +DL_ARCH[4]="X86" +DL_EXTRACT_TO[4]="Addons/bundles" +DL_WINST_NAME[4]=GhosteryXpi + +DL_FILE[5]="fastdial@telega.phpnet.us.xpi" +DL_SOURCE[5]="http://www.userlogos.org/files/fastdial-4.12-fx.xpi" +DL_ARCH[5]="X86" DL_EXTRACT_TO[5]="Addons/bundles" DL_WINST_NAME[5]=FastDialXpi - + DL_FILE[6]="{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi" DL_SOURCE[6]="https://addons.mozilla.org/firefox/downloads/latest/684/addon-684-latest.xpi" -DL_ARCH[6]="X86_64" +DL_ARCH[6]="X86" DL_EXTRACT_TO[6]="Addons/bundles" DL_WINST_NAME[6]=FireFtpXpi - + DL_FILE[7]="{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi" DL_SOURCE[7]="https://addons.mozilla.org/firefox/downloads/latest/5791/addon-5791-latest.xpi" -DL_ARCH[7]="X86_64" +DL_ARCH[7]="X86" DL_EXTRACT_TO[7]="Addons/bundles" DL_WINST_NAME[7]=FlagFoxXpi - + DL_FILE[8]="{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi" DL_SOURCE[8]="https://addons.mozilla.org/firefox/downloads/latest/92382/platform:5/addon-92382-latest.xpi" -DL_ARCH[8]="X86_64" +DL_ARCH[8]="X86" DL_EXTRACT_TO[8]="Addons/bundles" DL_WINST_NAME[8]=IeTabV2Xpi - + DL_FILE[9]="{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi" DL_SOURCE[9]="https://addons.mozilla.org/firefox/downloads/latest/26/addon-26-latest.xpi" -DL_ARCH[9]="X86_64" +DL_ARCH[9]="X86" DL_EXTRACT_TO[9]="Addons/extensions" DL_WINST_NAME[9]=DownloadStatusBarXpi - + DL_FILE[10]="{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi" DL_SOURCE[10]="https://addons.mozilla.org/firefox/downloads/latest/748/addon-748-latest.xpi" -DL_ARCH[10]="X86_64" +DL_ARCH[10]="X86" DL_EXTRACT_TO[10]="Addons/extensions" DL_WINST_NAME[10]=GreasmonkeyXpi - - + # File array index for the image showing while installing the program ICON_DL_INDEX=0 -WINST_NAME[0]="InstallMsi" -WINST_VALUE[0]="Watefox Setup.msi" - -WINST_NAME[1]="ExtractDir" -WINST_VALUE[1]="86C0563" - -OPSI_INI_SECTION[0]="X86_64" -OPSI_INI_OPTION[0]="MsiId" -OPSI_INI_VALUE[0]="{FD7DEB7B-8CEA-44E5-AB2D-7C66786C0563}" +OPSI_INI_SECTION[0]="X86" +OPSI_INI_OPTION[0]="UninstallProg" +OPSI_INI_VALUE[0]="uninstall\helper.exe" OPSI_INI_SECTION[1]="X86" OPSI_INI_OPTION[1]="Prog32" @@ -97,4 +90,4 @@ OPSI_INI_VALUE[1]="waterfox.exe" OPSI_INI_SECTION[2]="X86_64" OPSI_INI_OPTION[2]="Prog64" -OPSI_INI_VALUE[2]="waterfox.exe" \ No newline at end of file +OPSI_INI_VALUE[2]="waterfox.exe" diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index 8abbed3..0b2d32b 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -28,34 +28,29 @@ function create() { echo "Create" builder_create - mkdir -p $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles -# mv $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/*.xpi $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles + mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/bundles +# mv $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/bundles - pushd $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles + pushd $INST_DIR/CLIENT_DATA/X86/Addons/bundles for file in `ls *.xpi` do dirname=`echo $file|sed 's/\.xpi$//g'` mkdir $dirname - 7z x -o$INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/$file + 7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/bundles/$file done popd - rm $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/*.xpi + rm $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi - sed -e "s!Mozilla Foundation!Waterfox Limited!" -i $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/langpack-de@firefox.mozilla.org/chrome/de/locale/branding/*.* - sed -e "s!Mozilla!Waterfox Project!" -i $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/langpack-de@firefox.mozilla.org/chrome/de/locale/branding/*.* - sed -e "s!Firefox!Waterfox!" -i $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/langpack-de@firefox.mozilla.org/chrome/de/locale/branding/*.* - sed -e "s!Firefox-Logos!Waterfox-Logos!" -i $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/langpack-de@firefox.mozilla.org/chrome/de/locale/branding/*.* - - mkdir -p $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions -# mv $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/*.xpi $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions + mkdir -p $INST_DIR/CLIENT_DATA/X86/Addons/extensions +# mv $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi $INST_DIR/CLIENT_DATA/X86/Addons/extensions - pushd $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions + pushd $INST_DIR/CLIENT_DATA/X86/Addons/extensions for file in `ls *.xpi` do dirname=`echo $file|sed 's/\.xpi$//g'` mkdir $dirname - 7z x -o$INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/$file + 7z x -o$INST_DIR/CLIENT_DATA/X86/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/extensions/$file done popd - rm $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/*.xpi + rm $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi } diff --git a/fastdial@telega.phpnet.us.xpi.sha1sum b/fastdial@telega.phpnet.us.xpi.sha1sum index 613a8b3..205703c 100644 --- a/fastdial@telega.phpnet.us.xpi.sha1sum +++ b/fastdial@telega.phpnet.us.xpi.sha1sum @@ -1 +1 @@ -bd8162ee67adc05192b3f214f2ff323b2cd5c082 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/fastdial@telega.phpnet.us.xpi +444f949b93796e34ead57ef04fcf733aae10ef6b /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/fastdial@telega.phpnet.us.xpi diff --git a/firefox@ghostery.com.xpi.sha1sum b/firefox@ghostery.com.xpi.sha1sum index 66c7fe2..7c1add6 100644 --- a/firefox@ghostery.com.xpi.sha1sum +++ b/firefox@ghostery.com.xpi.sha1sum @@ -1 +1 @@ -a645038f60468efbc508f00b0eac7f1442b2f393 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/firefox@ghostery.com.xpi +b614520a76d1bf5e94fe589e230cb50e8471c48c /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/firefox@ghostery.com.xpi diff --git a/langpack-de@firefox.mozilla.org.xpi.sha1sum b/langpack-de@firefox.mozilla.org.xpi.sha1sum deleted file mode 100644 index e699e29..0000000 --- a/langpack-de@firefox.mozilla.org.xpi.sha1sum +++ /dev/null @@ -1 +0,0 @@ -4f87eea23f51d3f7546506a098e5760cbf5108d1 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/langpack-de@firefox.mozilla.org.xpi diff --git a/vlc-plugin@videolan.org.xpi.sha1sum b/vlc-plugin@videolan.org.xpi.sha1sum new file mode 100644 index 0000000..6d5b40e --- /dev/null +++ b/vlc-plugin@videolan.org.xpi.sha1sum @@ -0,0 +1 @@ +64785b93151ddd70333db11bf35cfa5e78b69e45 /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/vlc-plugin@videolan.org.xpi diff --git a/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum b/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum index 3169666..d715767 100644 --- a/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum +++ b/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum @@ -1 +1 @@ -da55a6e7b76ca4e8c37eaca8a6695e99427423e0 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi +d70d0c3cb4b9a254824eef2dcdcfb4c764706c10 /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi diff --git a/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum b/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum index 30db3d5..e104f3c 100644 --- a/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum +++ b/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum @@ -1 +1 @@ -258c1b8acf7732b1c81784c0dd8bbe8c056e802e /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi +258c1b8acf7732b1c81784c0dd8bbe8c056e802e /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi diff --git a/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum b/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum index 1e4cab1..3492f71 100644 --- a/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum +++ b/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum @@ -1 +1 @@ -d1b2882ee51708e4c6fe9e28052baae9f7fc6a49 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi +d1b2882ee51708e4c6fe9e28052baae9f7fc6a49 /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi diff --git a/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum b/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum index a136da9..899db37 100644 --- a/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum +++ b/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum @@ -1 +1 @@ -c60ab7a966e88821c1501fe5dea3b21ad1d58e81 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi +7876e24511c23f371446cb83dd6aa336b8904bf5 /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi diff --git a/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum b/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum index fe92b9c..dc6c15b 100644 --- a/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum +++ b/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum @@ -1 +1 @@ -5c3816e9a2d3a49fde2d1cde2868ab4b9e7dd73c /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi +12764b61c4961ad4c49cb5713ae36a0d7445abb6 /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi diff --git a/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum b/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum index 118a970..0176505 100644 --- a/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum +++ b/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum @@ -1 +1 @@ -4f592d17a7bd939513f656f52dba273ea0b4e4a4 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi +f1bb61c3c3420c0aa3544678bb9c8d8e85dd173e /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi