Skip to content

Commit 37f1846

Browse files
committed
ncp-config: fix empty values
Signed-off-by: nachoparker <[email protected]>
1 parent 42fd597 commit 37f1846

File tree

3 files changed

+10
-8
lines changed

3 files changed

+10
-8
lines changed

bin/ncp-update-nc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -181,10 +181,10 @@ find nextcloud/ -type f -exec chmod 640 {} \;
181181
echo "Upgrade..."
182182
ncc='sudo -u www-data php nextcloud/occ'
183183
$ncc upgrade # && false # test point
184-
$ncc | grep -q db:add-missing-indices && $ncc db:add-missing-indices
185-
$ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns
186-
$ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys
187-
$ncc | grep -q db:convert-filecache-bigint && $ncc db:convert-filecache-bigint
184+
$ncc | grep -q db:add-missing-indices && $ncc db:add-missing-indices -n
185+
$ncc | grep -q db:add-missing-columns && $ncc db:add-missing-columns -n
186+
$ncc | grep -q db:add-missing-primary-keys && $ncc db:add-missing-primary-keys -n
187+
$ncc | grep -q db:convert-filecache-bigint && $ncc db:convert-filecache-bigint -n
188188

189189
# done
190190
####################

changelog.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11

2-
[v1.33.1](https://github.com/nextcloud/nextcloudpi/commit/6891f49) (2020-12-12) nc-update-nc: improve error messages
2+
[v1.33.2](https://github.com/nextcloud/nextcloudpi/commit/1dc17a5) (2021-01-01) ncp-config: fix empty values
3+
4+
[v1.33.1](https://github.com/nextcloud/nextcloudpi/commit/42fd597) (2020-12-12) nc-update-nc: improve error messages
35

46
[v1.33.0](https://github.com/nextcloud/nextcloudpi/commit/ffd0b44) (2020-12-10) upgrade to NC20.0.3
57

etc/library.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,14 +40,14 @@ function configure_app()
4040
[[ $len -eq 0 ]] && return
4141

4242
# read cfg parameters
43+
local parameters=()
4344
for (( i = 0 ; i < len ; i++ )); do
4445
local var="$(jq -r ".params[$i].id" <<<"$cfg")"
4546
local val="$(jq -r ".params[$i].value" <<<"$cfg")"
4647
local vars+=("$var")
4748
local vals+=("$val")
4849
local idx=$((i+1))
49-
[[ "$val" == "" ]] && val=_
50-
local parameters+="$var $idx 1 $val $idx 15 60 120 "
50+
parameters+=("$var" "$idx" 1 "$val" "$idx" 15 60 120)
5151
done
5252

5353
# dialog
@@ -62,7 +62,7 @@ function configure_app()
6262
value="$( dialog --ok-label "Start" \
6363
--no-lines --backtitle "$backtitle" \
6464
--form "Enter configuration for $ncp_app" \
65-
20 70 0 $parameters \
65+
20 70 0 "${parameters[@]}" \
6666
3>&1 1>&2 2>&3 )"
6767
res=$?
6868

0 commit comments

Comments
 (0)