fix version info

This commit is contained in:
Jaquee 2017-05-02 20:01:49 +02:00
parent 4ca35af11a
commit af1edc0c95
2 changed files with 8 additions and 2 deletions

View file

@ -78,11 +78,11 @@ fi
# force version update # force version update
get_tag get_tag
echo "var GUI_VERSION = \"$VERSIONTAG\"" > version.js echo "var GUI_VERSION = \"$TAGNAME\"" > version.js
pushd "$MONERO_DIR" pushd "$MONERO_DIR"
get_tag get_tag
popd popd
echo "var GUI_MONERO_VERSION = \"$VERSIONTAG\"" >> version.js echo "var GUI_MONERO_VERSION = \"$TAGNAME\"" >> version.js
cd build cd build
qmake ../monero-wallet-gui.pro "$CONFIG" || exit qmake ../monero-wallet-gui.pro "$CONFIG" || exit

View file

@ -53,6 +53,12 @@ function get_tag()
echo "You are ahead of or behind a tagged release" echo "You are ahead of or behind a tagged release"
VERSIONTAG="$COMMIT" VERSIONTAG="$COMMIT"
fi fi
# save tag name + commit if availible
TAGNAME=$(git describe | sed -e 's/[\t ]*//')
if test -z "$TAGNAME"
then
TAGNAME="$VERSIONTAG"
fi
fi fi
fi fi
} }