From 8ca99707ce6281af1783f33f183887362146a500 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Thu, 31 May 2012 21:38:47 +0200
Subject: [PATCH] Update install.sh

---
 README     |  2 +-
 README.fr  |  2 +-
 install.sh | 12 ++++++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/README b/README
index 8c8a8aa..83d3a2e 100644
--- a/README
+++ b/README
@@ -2,7 +2,7 @@ KissCount is personnal account software delivered under GPL v3 licence terms.
 
 Current version is 0.3
 
-Qt4 (>= 4.7), libqt4-sql-sqlite and libofx are needed (Linux only)
+Qt4 (>= 4.7), libqt4-sql-sqlite and libofx (Linux only) are needed
 
 If you use web view, edit database.php and set $BDD_FILE, it's higly recommanded to use an SSL certificate.
 
diff --git a/README.fr b/README.fr
index 1f41140..38111a6 100644
--- a/README.fr
+++ b/README.fr
@@ -2,7 +2,7 @@ KissCount est un logiciel de gestion de comptes personnels délivré sous licenc
 
 La version actuelle est 0.3
 
-Qt4 (>= 4.7), libqt4-sql-sqlite et libofx sont nécessaires (Uniquement pour Linux)
+Qt4 (>= 4.7), libqt4-sql-sqlite et libofx (Uniquement pour Linux) sont nécessaires
 
 Si vous utilisez la version web pour visualiser vos comptes, éditez d'abord le fichier database.php en positionnant correctement la variable $BDD_FILE, il est fortement recommandé d'utiliser un certificat SSL.
 
diff --git a/install.sh b/install.sh
index 1911350..91c6309 100755
--- a/install.sh
+++ b/install.sh
@@ -19,10 +19,11 @@
 # You should have received a copy of the GNU General Public License
 # along with KissCount.  If not, see <http://www.gnu.org/licenses/>.
 
-ROOT_DIR=/usr
-SHARE_DIR=$ROOT_DIR/share/kisscount
-LIB_DIR=$ROOT_DIR/lib/kisscount
-BIN_DIR=$ROOT_DIR/bin
+DEST_DIR=""
+ROOT_DIR=$DEST_DIR/usr
+SHARE_DIR=$DEST_DIR$ROOT_DIR/share/kisscount
+LIB_DIR=$DEST_DIR$ROOT_DIR/lib/kisscount
+BIN_DIR=$DEST_DIR$ROOT_DIR/bin
 
 case "$1" in
     --install|-i)
@@ -34,6 +35,7 @@ case "$1" in
 
 	sudo mkdir -p $SHARE_DIR
 	sudo mkdir -p $LIB_DIR
+	sudo mkdir -p ~/.local/share/kisscount
 	sudo cp -r ressources/* $SHARE_DIR
 	sudo cp kc $BIN_DIR
 	sudo cp -r lib/* $LIB_DIR
@@ -47,6 +49,8 @@ case "$1" in
 	sudo rm -rf $LIB_DIR
 	sudo rm -f $BIN_DIR/kc
 
+	echo "Private database (~/.local/share/kisscount) not deleted"
+	echo
 	echo "KissCount successfully uninstalled !"
 	;;