Fix the sandbox scripts in absence of the OPAMROOT variable

ocaml · Sep 11, 2023 · ff15a03 · ff15a03
1 parent ef3e65f
commit ff15a03
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/master_changes.md b/master_changes.md
@@ -66,7 +66,7 @@ users)
 ## Format upgrade
 
 ## Sandbox
-  * Make /tmp writable again to restore POSIX compliancy [#5634 @kit-ty-kate - fixes #5462]
+  * Make /tmp writable again to restore POSIX compliancy [#5634 #5662 @kit-ty-kate - fixes #5462]
 
 ## VCS
 

diff --git a/src/state/shellscripts/bwrap.sh b/src/state/shellscripts/bwrap.sh
@@ -101,7 +101,7 @@ add_dune_cache_mount() {
 
 # In case OPAMROOT happens to be in one of the writeable directories we
 # need to make sure it is read-only
-if [ -n ${OPAMROOT+x} ]; then
+if [ -n "${OPAMROOT:-}" ]; then
   add_mounts ro "$OPAMROOT"
 fi
 

diff --git a/src/state/shellscripts/sandbox_exec.sh b/src/state/shellscripts/sandbox_exec.sh
@@ -58,7 +58,7 @@ add_dune_cache_mount() {
 
 # In case OPAMROOT happens to be in one of the writeable directories we
 # need to make sure it is read-only
-if [ -n ${OPAMROOT+x} ]; then
+if [ -n "${OPAMROOT:-}" ]; then
   add_mounts ro "$OPAMROOT"
 fi