psi-jack/yadm
1
0
Fork 0
mirror of synced 2025-01-08 14:11:06 -05:00
Code Issues Releases Wiki Activity

Fix parsing by sh (#299)

Browse source
This commit is contained in:
Tim Byrne 2021-01-07 10:46:06 -06:00
parent afab29c5fc
commit b32025bcc3
No known key found for this signature in database
GPG key ID: 14DB4FC2465A4B12
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
yadm
View file

@ -1323,7 +1323,10 @@ function upgrade() {
# been cloned first and then added as a submodule. # been cloned first and then added as a submodule.
"$GIT_PROGRAM" submodule absorbgitdirs "$GIT_PROGRAM" submodule absorbgitdirs
local submodule_status
submodule_status=$("$GIT_PROGRAM" -C "$YADM_WORK" submodule status)
while read -r sha submodule rest; do while read -r sha submodule rest; do
[ "$submodule" == "" ] && continue
if [[ "$sha" = -* ]]; then if [[ "$sha" = -* ]]; then
continue continue
fi fi
@ -1334,7 +1337,7 @@ function upgrade() {
error_out "Unable to upgrade. Could not deinit submodule $submodule" error_out "Unable to upgrade. Could not deinit submodule $submodule"
} }
submodules+=("$submodule") submodules+=("$submodule")
done < <("$GIT_PROGRAM" -C "$YADM_WORK" submodule status) done <<< "$submodule_status"
assert_parent "$YADM_REPO" assert_parent "$YADM_REPO"
mv "$LEGACY_REPO" "$YADM_REPO" mv "$LEGACY_REPO" "$YADM_REPO"