From 6183e5515fec720ae7ba8e243c14af345fa21692 Mon Sep 17 00:00:00 2001
From: udeved <flower_of_life@gmx.net>
Date: Wed, 17 Dec 2014 19:40:28 +0100
Subject: [PATCH] only display manjarotools.conf sys path, if no user config
 present

---
 bin/buildiso.in | 8 +++++---
 bin/buildpkg.in | 4 +++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/bin/buildiso.in b/bin/buildiso.in
index 7fe11c8..f1d1603 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -25,9 +25,11 @@ SYSCONFDIR='@sysconfdir@'
 display_settings(){
     msg "manjaro-tools"
     msg2 "version: ${version}"
-    msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
+    
     if [[ -f ${USER_CONFIG}/manjaro-tools.conf ]]; then
 	msg2 "user_config: ${USER_CONFIG}/manjaro-tools.conf"
+    else
+	msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
     fi
     
     msg "OPTIONS:"
@@ -140,7 +142,7 @@ usage() {
     echo '    -v                 Verbose'
     echo '    -q                 Query settings and pretend build'
     echo '    -c                 Disable clean work dir'
-    echo '    -f                 Disable iso image verwrite'
+    echo '    -f                 Disable iso image overwrite'
     echo '    -z                 Disable High compression'
     echo '    -A                 Disable auto configure livecd services as specified'
     echo '                       in manjaro-tools.conf'
@@ -240,7 +242,7 @@ compress_images(){
 }
 
 if ${iso_only}; then
-    [[ ! -d ${work_dir} ]] && die "You need to create images first eg buildiso -I"
+    [[ ! -d ${work_dir} ]] && die "You need to create images first eg buildiso -B"
     compress_images 
     exit 1
 fi
diff --git a/bin/buildpkg.in b/bin/buildpkg.in
index 16ecdc4..957b242 100644
--- a/bin/buildpkg.in
+++ b/bin/buildpkg.in
@@ -24,9 +24,11 @@ SYSCONFDIR='@sysconfdir@'
 display_settings(){
     msg "manjaro-tools"
     msg2 "version: ${version}"
-    msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
+    
     if [[ -f ${USER_CONFIG}/manjaro-tools.conf ]]; then
 	msg2 "user_config: ${USER_CONFIG}/manjaro-tools.conf"
+    else
+	msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
     fi
     
     msg "OPTIONS:"