mirror of
https://github.com/TheLocehiliosan/yadm
synced 2024-10-27 20:34:27 +00:00
Fix parsing by sh (#299)
This commit is contained in:
parent
afab29c5fc
commit
b32025bcc3
5
yadm
5
yadm
@ -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"
|
||||||
|
Loading…
Reference in New Issue
Block a user