Browse code

Merge "ini-config : always reenable xtrace on return"

Jenkins authored on 2015/07/28 05:41:13
Showing 1 changed files
... ...
@@ -104,7 +104,10 @@ function iniadd_literal {
104 104
     local option=$3
105 105
     local value=$4
106 106
 
107
-    [[ -z $section || -z $option ]] && return
107
+    if [[ -z $section || -z $option ]]; then
108
+        $xtrace
109
+        return
110
+    fi
108 111
 
109 112
     # Add it
110 113
     sed -i -e "/^\[$section\]/ a\\
... ...
@@ -123,7 +126,10 @@ function inidelete {
123 123
     local section=$2
124 124
     local option=$3
125 125
 
126
-    [[ -z $section || -z $option ]] && return
126
+    if [[ -z $section || -z $option ]]; then
127
+        $xtrace
128
+        return
129
+    fi
127 130
 
128 131
     # Remove old values
129 132
     sed -i -e "/^\[$section\]/,/^\[.*\]/ { /^$option[ \t]*=/ d; }" "$file"
... ...
@@ -141,7 +147,10 @@ function iniset {
141 141
     local option=$3
142 142
     local value=$4
143 143
 
144
-    [[ -z $section || -z $option ]] && return
144
+    if [[ -z $section || -z $option ]]; then
145
+        $xtrace
146
+        return
147
+    fi
145 148
 
146 149
     if ! grep -q "^\[$section\]" "$file" 2>/dev/null; then
147 150
         # Add section at the end