projects / pot_lu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 31b07df)
v202011161227 t1.0.18 1.0.18
authorKilian Saffran <ksaffran@dks.lu>
Mon, 16 Nov 2020 11:27:15 +0000 (12:27 +0100)
committerKilian Saffran <ksaffran@dks.lu>
Mon, 16 Nov 2020 11:27:15 +0000 (12:27 +0100)
app/tmpl/index.tt patch | blob | history
desktopapp/package.json patch | blob | history
install/update_app.sh patch | blob | history

diff --git a/app/tmpl/index.tt b/app/tmpl/index.tt
index c77540e..fe86519 100644 (file)
--- a/app/tmpl/index.tt
+++ b/app/tmpl/index.tt
@@ -1,4 +1,4 @@
-[% appversion = '1.0.15' %]
+[% appversion='1.0.18' %]
 [% minify = '' %]
 <!DOCTYPE html>
 <html lang="fr">
diff --git a/desktopapp/package.json b/desktopapp/package.json
index bfdd466..ccbf66e 100644 (file)
--- 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 42fd3fa..635f7d3 100644 (file)
--- 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
 
Unnamed repository; edit this file 'description' to name the repository.