From 8700da480615a0afc8715fda05e77912c4ce94f6 Mon Sep 17 00:00:00 2001
From: anmol26s <github@datamol.org>
Date: Sat, 6 Oct 2018 22:49:29 +0530
Subject: [PATCH] Updated to version 0.5

---
 conf/app.src      |  4 ++--
 conf/php-fpm.conf |  2 ++
 conf/php-fpm.ini  | 10 ----------
 scripts/upgrade   |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)
 delete mode 100644 conf/php-fpm.ini

diff --git a/conf/app.src b/conf/app.src
index 1adfde7..e561fcc 100644
--- a/conf/app.src
+++ b/conf/app.src
@@ -1,5 +1,5 @@
-SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/0.4.tar.gz
-SOURCE_SUM=2bfe446b5aeca3facfc2903cad4ca33fe04e8e71e45c1ecfe31669b08d31afe1
+SOURCE_URL=https://github.com/kevinpapst/kimai2/archive/0.5.tar.gz
+SOURCE_SUM=da51150b90c7aa2ab3634dc7768c12875a30bbbc63262bba4bc0881d6b7f2c87
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_IN_SUBDIR=true
diff --git a/conf/php-fpm.conf b/conf/php-fpm.conf
index 4324452..ed1932d 100644
--- a/conf/php-fpm.conf
+++ b/conf/php-fpm.conf
@@ -400,3 +400,5 @@ max_execution_time = 600
 ; max_input_time = 300
 ; memory_limit = 256M
 ; short_open_tag = On
+
+
diff --git a/conf/php-fpm.ini b/conf/php-fpm.ini
deleted file mode 100644
index 006abf2..0000000
--- a/conf/php-fpm.ini
+++ /dev/null
@@ -1,10 +0,0 @@
-; Common values to change to increase file upload limit
-upload_max_filesize = 8M
-post_max_size = 8M
-; mail.add_x_header = Off
-
-; Other common parameters
-max_execution_time = 600
-; max_input_time = 300
-; memory_limit = 256M
-; short_open_tag = On
diff --git a/scripts/upgrade b/scripts/upgrade
index 6abbf3b..ed6a3aa 100755
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -77,7 +77,7 @@ ynh_install_php7
 # Download, check integrity, uncompress and patch the source from app.src and do required installation for update
 
 #version check for 0.3
-version=`sed -n 's/^future-release=//p' /var/www/kimai2/.github_changelog_generator`
+version=`cd /var/www/$app && bin/console kimai:version --short 2> /dev/null || sed -n 's/^future-release=//p' .github_changelog_generator`
 
 # Uncompress latest sources
 ynh_setup_source "$final_path"