librewolf-bot/windows
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

added -strict

Browse source
This commit is contained in:
Bert van der Weerd 2021-04-11 12:40:10 +02:00
parent 79fa60e3ee
commit 1cc106f950
No known key found for this signature in database
GPG key ID: 4CFABB96ADE0F5B1
2 changed files with 33 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
artifacts_all.sh
View file

@ -25,40 +25,42 @@ cd librewolf ; rm -rf maintenanceservice* pingsender* firefox.*.xml precomplete
# windows: copy the windows icon # windows: copy the windows icon
cp -v common/source_files/browser/branding/librewolf/firefox.ico librewolf/librewolf.ico cp -v common/source_files/browser/branding/librewolf/firefox.ico librewolf/librewolf.ico
# create the final zip artifact # create the final zip/exe artifacts
rm -f librewolf-$pkgver.en-US.$ospkg.zip if [ -z $strict ]; then
zip -qr9 librewolf-$pkgver.en-US.$ospkg.zip librewolf rm -f librewolf-$pkgver.en-US.$ospkg.zip
if [ $? -ne 0 ]; then exit 1; fi zip -qr9 librewolf-$pkgver.en-US.$ospkg.zip librewolf
# now to try to make the installer
rm -f librewolf-$pkgver.en-US.win64-setup.exe tmp.nsi
sed "s/pkg_version/$pkgver/g" < artifacts_win.nsi > tmp.nsi
makensis-3.01.exe -V1 tmp.nsi
if [ $? -ne 0 ]; then exit 1; fi
# patch to permissive config
if [ ! -z $permissive ]; then
pushd librewolf
echo "Applying permissive patches..."
cp -v ../settings/librewolf.cfg . && cp -v ../settings/distribution/policies.json distribution
patch -p1 -i ../patches/permissive/librewolf-config.patch
patch -p1 -i ../patches/permissive/librewolf-policies.patch
popd
# create the final zip artifact
rm -f librewolf-$pkgver.en-US.$ospkg-permissive.zip
zip -qr9 librewolf-$pkgver.en-US.$ospkg-permissive.zip librewolf
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
# now to try to make the installer # now to try to make the installer
rm -f librewolf-$pkgver.en-US.win64-permissive-setup.exe tmp-permissive.nsi rm -f librewolf-$pkgver.en-US.win64-setup.exe tmp.nsi
sed "s/win64-setup/win64-permissive-setup/g" < tmp.nsi > tmp-permissive.nsi sed "s/pkg_version/$pkgver/g" < artifacts_win.nsi > tmp.nsi
makensis-3.01.exe -V1 tmp-permissive.nsi makensis-3.01.exe -V1 tmp.nsi
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
fi
# patch to strict config # patch to permissive config
if [ ! -z $strict ]; then if [ ! -z $permissive ]; then
pushd librewolf
echo "Applying permissive patches..."
cp -v ../settings/librewolf.cfg . && cp -v ../settings/distribution/policies.json distribution
patch -p1 -i ../patches/permissive/librewolf-config.patch
patch -p1 -i ../patches/permissive/librewolf-policies.patch
popd
# create the final zip artifact
rm -f librewolf-$pkgver.en-US.$ospkg-permissive.zip
zip -qr9 librewolf-$pkgver.en-US.$ospkg-permissive.zip librewolf
if [ $? -ne 0 ]; then exit 1; fi
# now to try to make the installer
rm -f librewolf-$pkgver.en-US.win64-permissive-setup.exe tmp-permissive.nsi
sed "s/win64-setup/win64-permissive-setup/g" < tmp.nsi > tmp-permissive.nsi
makensis-3.01.exe -V1 tmp-permissive.nsi
if [ $? -ne 0 ]; then exit 1; fi
fi
else
# patch to strict config
pushd librewolf pushd librewolf
echo "Applying strict config..." echo "Applying strict config..."
cp -v ../settings/librewolf.cfg . && cp -v ../settings/distribution/policies.json distribution cp -v ../settings/librewolf.cfg . && cp -v ../settings/distribution/policies.json distribution
@ -73,9 +75,11 @@ if [ ! -z $strict ]; then
# now to try to make the installer # now to try to make the installer
rm -f librewolf-$pkgver.en-US.win64-strict-setup.exe tmp-strict.nsi rm -f librewolf-$pkgver.en-US.win64-strict-setup.exe tmp-strict.nsi
sed "s/pkg_version/$pkgver/g" < artifacts_win.nsi > tmp.nsi
sed "s/win64-setup/win64-strict-setup/g" < tmp.nsi > tmp-strict.nsi sed "s/win64-setup/win64-strict-setup/g" < tmp.nsi > tmp-strict.nsi
makensis-3.01.exe -V1 tmp-strict.nsi makensis-3.01.exe -V1 tmp-strict.nsi
if [ $? -ne 0 ]; then exit 1; fi if [ $? -ne 0 ]; then exit 1; fi
fi fi
popd popd

1
build.sh
View file

@ -636,7 +636,6 @@ Use: ./build.sh clean | all | [other stuff...]
artifacts_win - apply .cfg, build the zip file and NSIS setup.exe installer. artifacts_win - apply .cfg, build the zip file and NSIS setup.exe installer.
artifacts_perm - package as above, but use the permissive config/policies. artifacts_perm - package as above, but use the permissive config/policies.
artifacts_strict - package as above, but use the strict config/policies.
# Linux related functions: # Linux related functions: