From d64f7f73c4f87fdf5a80305c5dde56d05f2e4fc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Bobot?= <francois.bobot@cea.fr>
Date: Sat, 9 May 2020 00:05:28 +0200
Subject: [PATCH] [Bix] fix unneeded escaping
---
nix/default.nix | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index c3d35503553..c212c758009 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -44,17 +44,17 @@ rec {
'';
setupHook = pkgs.writeText "setupHook.sh" ''
addFramaCPath () {
- if test -d "''$1/lib/frama-c/plugins"; then
- export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN:-}''${FRAMAC_PLUGIN:+:}''$1/lib/frama-c/plugins"
- export OCAMLPATH="''${OCAMLPATH:-}''${OCAMLPATH:+:}''$1/lib/frama-c/plugins"
+ if test -d "$1/lib/frama-c/plugins"; then
+ export FRAMAC_PLUGIN="''${FRAMAC_PLUGIN:-}''${FRAMAC_PLUGIN:+:}$1/lib/frama-c/plugins"
+ export OCAMLPATH="''${OCAMLPATH:-}''${OCAMLPATH:+:}$1/lib/frama-c/plugins"
fi
- if test -d "''$1/lib/frama-c"; then
- export OCAMLPATH="''${OCAMLPATH:-}''${OCAMLPATH:+:}''$1/lib/frama-c"
+ if test -d "$1/lib/frama-c"; then
+ export OCAMLPATH="''${OCAMLPATH:-}''${OCAMLPATH:+:}$1/lib/frama-c"
fi
- if test -d "''$1/share/frama-c/"; then
- export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE:-}''${FRAMAC_EXTRA_SHARE:+:}''$1/share/frama-c"
+ if test -d "$1/share/frama-c/"; then
+ export FRAMAC_EXTRA_SHARE="''${FRAMAC_EXTRA_SHARE:-}''${FRAMAC_EXTRA_SHARE:+:}$1/share/frama-c"
fi
}
--
GitLab