From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Date: Thu, 16 Feb 2017 13:33:57 +0000 (+0100)
Subject: Bug 16749: Check instancename in adjust_paths_dev_install
X-Git-Tag: v17.05.00~681
X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=70e709393db743b3c722b0c574adface1787e98f;p=koha_ffzg

Bug 16749: Check instancename in adjust_paths_dev_install

Check if the instance does not exist (or was not even passed).

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
---

diff --git a/debian/scripts/koha-functions.sh b/debian/scripts/koha-functions.sh
index 1fdfe83378..256ae2b700 100755
--- a/debian/scripts/koha-functions.sh
+++ b/debian/scripts/koha-functions.sh
@@ -222,7 +222,11 @@ adjust_paths_dev_install()
 # corresponding tag in koha-conf.xml
 
     local instancename=$1
-    local dev_install=$(run_safe_xmlstarlet $instancename dev_install)
+    local dev_install=""
+
+    if [ "$instancename" != "" ] && is_instance $instancename; then
+        dev_install=$(run_safe_xmlstarlet $instancename dev_install)
+    fi
 
     if [ "$dev_install" != "" ] && [ "$dev_install" != "0" ]; then
         DEV_INSTALL=1