colin/sxmo-utils
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sxmo_migrate.sh: fix "3 Use your [u]ser version as-is" empty configversion

Browse Source
This commit is contained in:
Willow Barraco
2023-08-30 11:41:45 +02:00
parent f61bb64aca
commit ebe88d9ef9
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/core/sxmo_migrate.sh
View File

@@ -77,12 +77,12 @@ resolvedifference() {
;; ;;
[3uU]*) [3uU]*)
#update configversion automatically #update configversion automatically
refversion="$(fetchversion "$reffile")" refversion="$(fetchversion "$defaultfile")"
userversion="$(fetchversion "$userfile")" userversion="$(fetchversion "$userfile")"
if [ -n "$userversion" ]; then if [ -n "$userversion" ]; then
sed -i "s/configversion: $userversion/configversion: $refversion/" "$userfile" || abort=1 sed -i "s/configversion: $userversion/configversion: $refversion/" "$userfile" || abort=1
elif [ -n "$refversion" ]; then elif [ -n "$refversion" ]; then
refline="$(head -n5 "$reffile" | grep -m1 "configversion: ")" refline="$(head -n5 "$defaultfile" | grep -m1 "configversion: ")"
# fall back in case the userfile doesn't contain a configversion at all yet # fall back in case the userfile doesn't contain a configversion at all yet
sed -i "2i$refline" "$userfile" || abort=1 sed -i "2i$refline" "$userfile" || abort=1
fi fi