diff --git a/packaging_script_AppImage.sh b/packaging_script_AppImage.sh index 070e0b155..647680fa4 100755 --- a/packaging_script_AppImage.sh +++ b/packaging_script_AppImage.sh @@ -15,13 +15,7 @@ GITCOMMIT=$(git rev-parse --short HEAD) A=$(git rev-list HEAD --count) HEAD=$(($A+473)) -VERSION=$(cat sources/qet.h | grep "const QString version" | cut -d\" -f2 | cut -d\" -f1) #Find version tag in GIT sources/qet.h -tagName=$(cat sources/qet.h | grep displayedVersion | cut -d\" -f2 | cut -d\" -f1) #Find displayedVersion tag in GIT sources/qet.h - -# recupere le numero de la nouvelle revision -#revAp=$(svnversion | cut -d : -f 2 | tr -d '[:alpha:]') - -# On recupere le numero de version de l'originale +# We recover the version number of the original tagName=$(sed -n "s/const QString displayedVersion =\(.*\)/\1/p" sources/qet.h | cut -d\" -f2 | cut -d\" -f1 ) # On modifie l'originale avec le numéro de révision du dépôt GIT diff --git a/packaging_script_Flatpak.sh b/packaging_script_Flatpak.sh index 677e0164f..cf6fa3424 100755 --- a/packaging_script_Flatpak.sh +++ b/packaging_script_Flatpak.sh @@ -9,26 +9,20 @@ git reset --hard origin/master cd .. -# Fait une mise à jour +# get updates git pull -#git checkout test_pugi sed -i 's/DEFINES += QET_EXPORT_PROJECT_DB/#DEFINES += QET_EXPORT_PROJECT_DB/' qelectrotech.pro +# get the number of the new revision GITCOMMIT=$(git rev-parse --short HEAD) -A=$(git rev-list HEAD --count) -HEAD=$(($A+473)) -VERSION=$(cat sources/qet.h | grep "const QString version" | cut -d\" -f2 | cut -d\" -f1) #Find version tag in GIT sources/qet.h tagName=$(cat sources/qet.h | grep displayedVersion | cut -d\" -f2 | cut -d\" -f1) #Find displayedVersion tag in GIT sources/qet.h -# recupere le numero de la nouvelle revision -#revAp=$(svnversion | cut -d : -f 2 | tr -d '[:alpha:]') - -# On recupere le numero de version de l'originale +# We recover the version number of the original tagName=$(sed -n "s/const QString displayedVersion =\(.*\)/\1/p" sources/qet.h | cut -d\" -f2 | cut -d\" -f1 ) -# On modifie l'originale avec le numero de revision du depot svn +# We modify the original with the revision number of the svn repository sed -i 's/'"const QString displayedVersion =.*/const QString displayedVersion = \"$tagName+$GITCOMMIT\";"'/' sources/qet.h cd ~