From 4b2e151bd7bbec7fe43ceec49b150a59b0c557d6 Mon Sep 17 00:00:00 2001 From: Kilian Saffran Date: Mon, 16 Nov 2020 12:27:15 +0100 Subject: [PATCH] v202011161227 t1.0.18 --- app/tmpl/index.tt | 2 +- desktopapp/package.json | 2 +- install/update_app.sh | 12 ++++++------ 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt index c77540ef..fe865196 100644 --- a/app/tmpl/index.tt +++ b/app/tmpl/index.tt @@ -1,4 +1,4 @@ -[% appversion = '1.0.15' %] +[% appversion='1.0.18' %] [% minify = '' %] diff --git a/desktopapp/package.json b/desktopapp/package.json index bfdd4665..ccbf66e0 100644 --- a/desktopapp/package.json +++ b/desktopapp/package.json @@ -1,6 +1,6 @@ { "name": "POT", - "version": "1.0.17", + "version": "1.0.18", "description": "plan d'organisation du travail", "main": "main.js", "scripts": { diff --git a/install/update_app.sh b/install/update_app.sh index 42fd3fab..635f7d3b 100644 --- a/install/update_app.sh +++ b/install/update_app.sh @@ -22,7 +22,7 @@ if [ "${TAGEXISTS}" == "" ] then echo "create tag $tag" git add -A - sed -i -e "s/^\[% appversion\s*=\s*.*/\[% appversion=\'$tag\' %\]/" tmpl/index.tt + sed -i -e "s/^\[% appversion\s*=\s*.*/\[% appversion=\'$tag\' %\]/" app/tmpl/index.tt sed -i -e "s/\"version\": \".*\",/\"version\": \"$tag\",/" desktopapp/package.json git commit -a -m "v${CDATE} t$tag" git tag $tag @@ -37,7 +37,7 @@ git archive -o ${PROJECTDIR}"/release/$tag.zip" $tag:app cd ${PROJECTDIR}"/release" unzip $tag.zip rm $tag.zip -exit(0) + source ${CALLDIR}"/../dev/conf.sh" find . -type f -printf "%p|%s\n" | grep -v -e "\/data\/output\/" | grep -v -e "\/data\/tmp\/" | grep -v -e "\/tools\/" | sort > ${TMPDIR}/sourcefiles.local.txt @@ -79,8 +79,8 @@ then echo "NO Files to Install/upload!" fi fi -if [ -e ${TMPDIR}/update_${CDATE}.tar.gz ] -then - rm ${TMPDIR}/update_${CDATE}.tar.gz -fi +# if [ -e ${TMPDIR}/update_${CDATE}.tar.gz ] +# then +# rm ${TMPDIR}/update_${CDATE}.tar.gz +# fi -- 2.39.5