Skip to content
Snippets Groups Projects
Commit 2d93cad8 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

gluon-core: always handle core scripts first

parent fa1774a4
No related branches found
No related tags found
No related merge requests found
...@@ -27,18 +27,8 @@ do_dir() { ...@@ -27,18 +27,8 @@ do_dir() {
fi fi
} }
do_component() {
version="$(version_of gluon-core)" local component="$1"
oldversion="$(cat "$VERSION_FILE" 2>/dev/null)"
if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_FREIFUNK" 2>/dev/null)"; fi
if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_LFF" 2>/dev/null)"; fi
if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_KFF" 2>/dev/null)"; fi
(
cd "$UPGRADE_DIR"
for component in *; do (
local version="$(version_of "$component")" local version="$(version_of "$component")"
if [ -z "$version" ]; then continue; fi if [ -z "$version" ]; then continue; fi
...@@ -63,6 +53,25 @@ if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_KFF" 2>/dev/null) ...@@ -63,6 +53,25 @@ if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_KFF" 2>/dev/null)
do_dir invariant do_dir invariant
echo "$version" > "$VERSION_DIR"/"$component" echo "$version" > "$VERSION_DIR"/"$component"
}
version="$(version_of core)"
oldversion="$(cat "$VERSION_FILE" 2>/dev/null)"
if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_FREIFUNK" 2>/dev/null)"; fi
if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_LFF" 2>/dev/null)"; fi
if [ -z "$oldversion" ]; then oldversion="$(cat "$VERSION_FILE_KFF" 2>/dev/null)"; fi
(
cd "$UPGRADE_DIR"
do_compoment core
for component in *; do (
if [ "$component" != 'core' ]; then
do_component "$component"
fi
) done ) done
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment