diff --git a/CLIENT_DATA/setup64.ins b/CLIENT_DATA/setup64.ins index 0520abf..275b8f8 100644 --- a/CLIENT_DATA/setup64.ins +++ b/CLIENT_DATA/setup64.ins @@ -91,7 +91,7 @@ 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\Addons\extensions\*.*" "$InstallDir$\extensions" ; Example of recursively copying some files into the installation directory: ; diff --git a/builder-product.cfg b/builder-product.cfg index 4ed2e9c..30fd050 100644 --- a/builder-product.cfg +++ b/builder-product.cfg @@ -29,6 +29,55 @@ DL_ARCH[2]="X86_64" DL_EXTRACT_TO[2]="Addons/bundles" 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_64" +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_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_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_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_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_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_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 diff --git a/builder-targets-cb.sh b/builder-targets-cb.sh index c329cab..8abbed3 100644 --- a/builder-targets-cb.sh +++ b/builder-targets-cb.sh @@ -46,16 +46,16 @@ function create() { 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 + 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_64/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/$file -# done -# popd -# rm $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/*.xpi + 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_64/Addons/extensions/$dirname $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/$file + done + popd + rm $INST_DIR/CLIENT_DATA/X86_64/Addons/extensions/*.xpi } diff --git a/fastdial@telega.phpnet.us.xpi.sha1sum b/fastdial@telega.phpnet.us.xpi.sha1sum new file mode 100644 index 0000000..613a8b3 --- /dev/null +++ b/fastdial@telega.phpnet.us.xpi.sha1sum @@ -0,0 +1 @@ +bd8162ee67adc05192b3f214f2ff323b2cd5c082 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/fastdial@telega.phpnet.us.xpi diff --git a/firefox@ghostery.com.xpi.sha1sum b/firefox@ghostery.com.xpi.sha1sum new file mode 100644 index 0000000..66c7fe2 --- /dev/null +++ b/firefox@ghostery.com.xpi.sha1sum @@ -0,0 +1 @@ +a645038f60468efbc508f00b0eac7f1442b2f393 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/firefox@ghostery.com.xpi diff --git a/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum b/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum new file mode 100644 index 0000000..3169666 --- /dev/null +++ b/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi.sha1sum @@ -0,0 +1 @@ +da55a6e7b76ca4e8c37eaca8a6695e99427423e0 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{1018e4d6-728f-4b20-ad56-37578a4de76b}.xpi diff --git a/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum b/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum new file mode 100644 index 0000000..30db3d5 --- /dev/null +++ b/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi.sha1sum @@ -0,0 +1 @@ +258c1b8acf7732b1c81784c0dd8bbe8c056e802e /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{1BC9BA34-1EED-42ca-A505-6D2F1A935BBB}.xpi diff --git a/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum b/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum new file mode 100644 index 0000000..1e4cab1 --- /dev/null +++ b/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi.sha1sum @@ -0,0 +1 @@ +d1b2882ee51708e4c6fe9e28052baae9f7fc6a49 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{D4DD63FA-01E4-46a7-B6B1-EDAB7D6AD389}.xpi diff --git a/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum b/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum new file mode 100644 index 0000000..5b08c37 --- /dev/null +++ b/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi.sha1sum @@ -0,0 +1 @@ +75fddb38f4ebc74f5dfcd97faf9635fcd350eadc /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{a7c6cf7f-112c-4500-a7ea-39801a327e5f}.xpi diff --git a/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum b/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum new file mode 100644 index 0000000..140cf2d --- /dev/null +++ b/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi.sha1sum @@ -0,0 +1 @@ +fea9c595c461e32d721a9bcc3a800c0761520b30 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d}.xpi diff --git a/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum b/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum new file mode 100644 index 0000000..118a970 --- /dev/null +++ b/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi.sha1sum @@ -0,0 +1 @@ +4f592d17a7bd939513f656f52dba273ea0b4e4a4 /home/mario/.opsi-dist-cache/waterfoxproject.waterfox-18.0.1/X86_64/{e4a8a97b-f2ed-450b-b12d-ee082ba24781}.xpi