diff options
| author | Karel Kočí <karel.koci@nic.cz> | 2017-05-22 12:39:26 +0200 |
|---|---|---|
| committer | Karel Kočí <karel.koci@nic.cz> | 2017-05-22 12:39:26 +0200 |
| commit | 311065139eabf33be78f99f4c3aa692bc1f5193b (patch) | |
| tree | d1448799e43b48ea8fd9d733d3a1e65e7fbf61ea /scripts | |
| parent | 9f154e163451844bfe692ca81b966ab9b963e8f4 (diff) | |
| download | turris-mymedkit-311065139eabf33be78f99f4c3aa692bc1f5193b.tar.gz turris-mymedkit-311065139eabf33be78f99f4c3aa692bc1f5193b.tar.bz2 turris-mymedkit-311065139eabf33be78f99f4c3aa692bc1f5193b.zip | |
Add root build script
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/build_tools.sh | 2 | ||||
| -rwxr-xr-x | scripts/updater-medkit.sh | 8 |
2 files changed, 7 insertions, 3 deletions
diff --git a/scripts/build_tools.sh b/scripts/build_tools.sh index 2adb27b..b161f87 100755 --- a/scripts/build_tools.sh +++ b/scripts/build_tools.sh @@ -12,7 +12,7 @@ git_pull() { else pushd $1 >/dev/null git fetch - if ! git diff --quiet HEAD origin/master; then + if ! git diff --quiet HEAD origin/HEAD; then git clean -Xdf git reset --hard origin/master git submodule update --init --recursive diff --git a/scripts/updater-medkit.sh b/scripts/updater-medkit.sh index 0ab5078..d7324ce 100755 --- a/scripts/updater-medkit.sh +++ b/scripts/updater-medkit.sh @@ -2,7 +2,6 @@ # This script is real medkit generator using updater set -e -VERSION="3.7" MODEL=omnia BRANCH= while [ $# -gt 0 ]; do @@ -27,6 +26,11 @@ while [ $# -gt 0 ]; do shift done +if [ -z "$VERSION" ]; then + echo "Missing --version argument!" >&2 + exit 1 +fi + ROOT=root-$MODEL [ -n "$BRANCH" ] && ROOT=$ROOT-$BRANCH rm -rf $ROOT @@ -34,7 +38,7 @@ mkdir $ROOT OUTPUT=medkit-$MODEL [ -n "$BRANCH" ] && OUTPUT=$OUTPUT-$BRANCH -OUTPUT=$PWD/$OUTPUT.tar.gz +OUTPUT=$PWD/$OUTPUT-$VERSION.tar.gz ## Create base filesystem for updater ln -s tmp $ROOT/var |