explicitly check error code instead of || true
This commit is contained in:
parent
0955d2d1c3
commit
3fe3e74c71
2 changed files with 5 additions and 22 deletions
|
@ -6,7 +6,11 @@
|
||||||
export buildRoot="$(pwd)"
|
export buildRoot="$(pwd)"
|
||||||
'' + old.buildCommand + ''
|
'' + old.buildCommand + ''
|
||||||
pushd $buildRoot
|
pushd $buildRoot
|
||||||
unzip $out/lib/firefox/browser/omni.ja -d patched_omni || true
|
unzip $out/lib/firefox/browser/omni.ja -d patched_omni || ret=$?
|
||||||
|
if [[ $ret && $ret -ne 2 ]]; then
|
||||||
|
echo "unzip exited with unexpected error"
|
||||||
|
exit $ret
|
||||||
|
fi
|
||||||
rm $out/lib/firefox/browser/omni.ja
|
rm $out/lib/firefox/browser/omni.ja
|
||||||
cd patched_omni
|
cd patched_omni
|
||||||
sed -i 's/"enterprise_only"\s*:\s*true,//' modules/policies/schema.sys.mjs
|
sed -i 's/"enterprise_only"\s*:\s*true,//' modules/policies/schema.sys.mjs
|
||||||
|
|
|
@ -1,21 +0,0 @@
|
||||||
From f1c293daaf7c299b6ee81f76525371bb04516394 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ryosuke Asano <ryosukeusuusu@gmail.com>
|
|
||||||
Date: Thu, 20 Jul 2023 12:21:37 +0900
|
|
||||||
Subject: [PATCH] [FB] Policies | Allow user can use Search engine policy
|
|
||||||
|
|
||||||
---
|
|
||||||
.../components/enterprisepolicies/schemas/policies-schema.json | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/browser/components/enterprisepolicies/schemas/policies-schema.json b/browser/components/enterprisepolicies/schemas/policies-schema.json
|
|
||||||
index 75293fb9b1fb5..bc4b901b34583 100644
|
|
||||||
--- a/browser/components/enterprisepolicies/schemas/policies-schema.json
|
|
||||||
+++ b/browser/components/enterprisepolicies/schemas/policies-schema.json
|
|
||||||
@@ -1228,7 +1228,6 @@
|
|
||||||
},
|
|
||||||
|
|
||||||
"SearchEngines": {
|
|
||||||
- "enterprise_only": true,
|
|
||||||
|
|
||||||
"type": "object",
|
|
||||||
"properties": {
|
|
Loading…
Add table
Reference in a new issue