nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

We DON'T want the gluon version file to collide with the package version stamp dir

Browse Source
This commit is contained in:
Matthias Schiffer 2014-02-26 10:21:14 +01:00
parent 7d27f1f045
commit 96b213c386
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/gluon-alfred/files/lib/gluon/alfred/announce.sh
View File

@ -36,7 +36,7 @@ fi
json_add_object "software"
json_add_object "firmware"
json_add_string "base" "gluon-$(cat /lib/gluon/version)"
json_add_string "base" "gluon-$(cat /lib/gluon/gluon-version)"
json_add_string "release" "$(cat /lib/gluon/release)"
json_close_object # firmware

2
package/gluon-core/Makefile
View File

@ -34,7 +34,7 @@ define Package/gluon-core/install
$(GLUON_GENERATE) ./generate/* $(1)/
$(INSTALL_DIR) $(1)/lib/gluon
echo "$(GLUON_VERSION)" > $(1)/lib/gluon/version
echo "$(GLUON_VERSION)" > $(1)/lib/gluon/gluon-version
echo "$(GLUON_RELEASE)" > $(1)/lib/gluon/release
endef

3
package/gluon-core/files/etc/uci-defaults/zzz-gluon-upgrade
View File

@ -12,6 +12,9 @@ else
fi
# Temporary fix for broken upgrades (happened between 20140225 and 20140226, remove next week)
if [ -f "$VERSION_DIR" ]; then rm "$VERSION_DIR"; fi
mkdir -p "$VERSION_DIR"