add back Langpack with Waterfox patch

This commit is contained in:
Mario Fetka 2013-10-16 14:35:58 +02:00
parent a29e908861
commit 6bee44c4cb
5 changed files with 73 additions and 61 deletions

View File

@ -15,7 +15,7 @@ endif
Message "Uninstalling " + $ProductId$ + " " + $OLD_VERSION$ + "-" + $OLD_CREATOR_TAG$ + $OLD_RELEASE$ + " ..."
if FileExists($IniFile$)
Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86","UninstallProg","XXXXXXXX.exe")
Set $UninstallProg$ = GetValueFromInifile($IniFile$,"X86_64","UninstallProg","XXXXXXXX.exe")
Set $UninstallProgramOld$ = $InstallDir$ + "\" + $UninstallProg$
if FileExists($UninstallProgramOld$)
comment "Uninstall program found, starting uninstall"

View File

@ -87,7 +87,7 @@ endif
@echo off
If exist "%System%\defaultassociations.xml" (copy "%System%\defaultassociations.xml" "$LogDir$") ELSE (copy "%ScriptPath%\defaultassociations.xml" "$LogDir$")
rem Handling for X86 installation directory since Windows Vista
rem Handling for X86_64 installation directory since Windows Vista
SET InstallDir=$InstallDir$
for /f "tokens=1-3 delims=\" %%a in ("$InstallDir$") do (
set a=%%a
@ -129,8 +129,8 @@ REG ADD HKLM\SOFTWARE\Mozilla\MaintenanceService /v Attempted /t REG_DWORD /d 1
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 -s "%ScriptPath%\X86_64\Addons\bundles\*.*" "$InstallDir$\distribution\bundles"
copy -s "%ScriptPath%\X86_64\Addons\extensions\*.*" "$InstallDir$\extensions"
[Registry_install]
; Example of setting some values of an registry key:

View File

@ -20,71 +20,77 @@ 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"
DL_ARCH[1]="X86_64"
DL_WINST_NAME[1]=InstallExe
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_FILE[2]="langpack-de@firefox.mozilla.org.xpi"
DL_SOURCE[2]="https://addons.mozilla.org/firefox/downloads/file/227956/deutsch_de_language_pack-24.0-fx.xpi"
DL_ARCH[2]="X86_64"
DL_EXTRACT_TO[2]="Addons/bundles"
DL_WINST_NAME[2]=VideolanClientXpi
DL_WINST_NAME[2]=GermanLangugaPackXpi
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"
DL_FILE[3]="vlc-plugin@videolan.org.xpi"
DL_SOURCE[3]="http://download.videolan.org/pub/videolan/vlc/last/win64/vlc-2.1.0.xpi"
DL_ARCH[3]="X86_64"
DL_EXTRACT_TO[3]="Addons/bundles"
DL_WINST_NAME[3]=AdblockPlusXpi
DL_WINST_NAME[3]=VideolanClientXpi
DL_FILE[4]="{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi"
DL_SOURCE[4]="https://addons.mozilla.org/firefox/downloads/latest/1865/addon-1865-latest.xpi"
DL_ARCH[4]="X86_64"
DL_EXTRACT_TO[4]="Addons/bundles"
DL_WINST_NAME[4]=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"
DL_EXTRACT_TO[4]="Addons/bundles"
DL_WINST_NAME[4]=GhosteryXpi
DL_FILE[5]="firefox@ghostery.com.xpi"
DL_SOURCE[5]="https://addons.mozilla.org/firefox/downloads/latest/9609/addon-9609-latest.xpi"
DL_ARCH[5]="X86_64"
DL_EXTRACT_TO[5]="Addons/bundles"
DL_WINST_NAME[5]=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"
DL_FILE[6]="fastdial@telega.phpnet.us.xpi"
DL_SOURCE[6]="http://www.userlogos.org/files/fastdial-4.12-fx.xpi"
DL_ARCH[6]="X86_64"
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"
DL_WINST_NAME[6]=FastDialXpi
DL_FILE[7]="{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi"
DL_SOURCE[7]="https://addons.mozilla.org/firefox/downloads/latest/684/addon-684-latest.xpi"
DL_ARCH[7]="X86_64"
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"
DL_WINST_NAME[7]=FireFtpXpi
DL_FILE[8]="{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi"
DL_SOURCE[8]="https://addons.mozilla.org/firefox/downloads/latest/5791/addon-5791-latest.xpi"
DL_ARCH[8]="X86_64"
DL_EXTRACT_TO[8]="Addons/bundles"
DL_WINST_NAME[8]=IeTabV2Xpi
DL_WINST_NAME[8]=FlagFoxXpi
DL_FILE[9]="{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi"
DL_SOURCE[9]="https://addons.mozilla.org/firefox/downloads/latest/92382/platform:5/addon-92382-latest.xpi"
DL_ARCH[9]="X86_64"
DL_EXTRACT_TO[9]="Addons/bundles"
DL_WINST_NAME[9]=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"
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"
DL_FILE[10]="{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi"
DL_SOURCE[10]="https://addons.mozilla.org/firefox/downloads/latest/26/addon-26-latest.xpi"
DL_ARCH[10]="X86_64"
DL_EXTRACT_TO[10]="Addons/extensions"
DL_WINST_NAME[10]=GreasmonkeyXpi
DL_WINST_NAME[10]=DownloadStatusBarXpi
DL_FILE[11]="{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi"
DL_SOURCE[11]="https://addons.mozilla.org/firefox/downloads/latest/748/addon-748-latest.xpi"
DL_ARCH[11]="X86_64"
DL_EXTRACT_TO[11]="Addons/extensions"
DL_WINST_NAME[11]=GreasmonkeyXpi
# File array index for the image showing while installing the program
ICON_DL_INDEX=0
OPSI_INI_SECTION[0]="X86"
OPSI_INI_SECTION[0]="X86_64"
OPSI_INI_OPTION[0]="UninstallProg"
OPSI_INI_VALUE[0]="uninstall\helper.exe"
OPSI_INI_SECTION[1]="X86"
OPSI_INI_SECTION[1]="X86_64"
OPSI_INI_OPTION[1]="Prog32"
OPSI_INI_VALUE[1]="waterfox.exe"

View File

@ -28,29 +28,34 @@ function create() {
echo "Create"
builder_create
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
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
pushd $INST_DIR/CLIENT_DATA/X86/Addons/bundles
pushd $INST_DIR/CLIENT_DATA/X86_64/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/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/bundles/$file
7z x -o$INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/$dirname $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/$file
done
popd
rm $INST_DIR/CLIENT_DATA/X86/Addons/bundles/*.xpi
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
rm $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/*.xpi
pushd $INST_DIR/CLIENT_DATA/X86/Addons/extensions
sed -e "s!Mozilla Foundation!Waterfox Limited!" -i $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/langpack-de@firefox.mozilla.org/browser/chrome/de/locale/branding/*.*
sed -e "s!Mozilla!Waterfox Project!" -i $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/langpack-de@firefox.mozilla.org/browser/chrome/de/locale/branding/*.*
sed -e "s!Firefox!Waterfox!" -i $INST_DIR/CLIENT_DATA/X86_64/Addons/bundles/langpack-de@firefox.mozilla.org/browser/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/browser/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
pushd $INST_DIR/CLIENT_DATA/X86_64/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/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86/Addons/extensions/$file
7z x -o$INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/$file
done
popd
rm $INST_DIR/CLIENT_DATA/X86/Addons/extensions/*.xpi
rm $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/*.xpi
}

View File

@ -0,0 +1 @@
6eeca96c47632133c6dc6f69a30fe7eb48275ba8 /home/mario/.opsi-dist-cache/waterfirefoxproject.waterfox-24.0/X86_64/langpack-de@firefox.mozilla.org.xpi