From 0dc1674e683b6249a22c30b6f787bd49dbc61a26 Mon Sep 17 00:00:00 2001
From: udeved <artoo@manjaro.org>
Date: Fri, 18 Dec 2015 01:56:21 +0100
Subject: [PATCH] remove profile_repo from config

---
 README.md               | 3 ---
 bin/buildiso.in         | 4 ++--
 data/manjaro-tools.conf | 3 ---
 lib/util.sh             | 6 +++---
 4 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 6009b9b..dc0a991 100644
--- a/README.md
+++ b/README.md
@@ -83,9 +83,6 @@ overriding
 
 ################ buildiso ################
 
-# the iso-profiles directory name/git repo name
-# profile_repo='manjaro-tools-iso-profiles'
-
 # default iso buildset; name without .set extension
 # buildset_iso=default
 
diff --git a/bin/buildiso.in b/bin/buildiso.in
index aa0dd46..cb255be 100755
--- a/bin/buildiso.in
+++ b/bin/buildiso.in
@@ -70,7 +70,7 @@ display_settings(){
 	msg2 "buildsets: $(list_sets ${sets_dir_iso})"
 	msg2 "buildset_iso: ${buildset_iso}"
 	msg2 "is_buildset: ${is_buildset}"
-	msg2 "profile_repo: ${profile_repo}"
+# 	msg2 "profile_repo: ${profile_repo}"
 
 	msg "OPTIONS:"
 	msg2 "arch: ${arch}"
@@ -108,7 +108,7 @@ load_config "${SYSCONFDIR}/manjaro-tools.conf"
 # to force old way to have buildiso run in iso-profiles dir
 # run_dir=$(pwd)
 
-load_run_dir "${profile_repo}"
+load_run_dir "manjaro-tools-iso-profiles"
 
 clean_first=true
 pretend=false
diff --git a/data/manjaro-tools.conf b/data/manjaro-tools.conf
index e685319..aadfa38 100644
--- a/data/manjaro-tools.conf
+++ b/data/manjaro-tools.conf
@@ -34,9 +34,6 @@
 
 ################ buildiso ################
 
-# the iso-profiles directory name/git repo name
-# profile_repo='manjaro-tools-iso-profiles'
-
 # default iso buildset; name without .set extension
 # buildset_iso=default
 
diff --git a/lib/util.sh b/lib/util.sh
index 58406c1..81e723c 100644
--- a/lib/util.sh
+++ b/lib/util.sh
@@ -201,7 +201,7 @@ init_buildiso(){
 	used_kernel=$(uname -r | cut -d . -f1)
 	[[ ${used_kernel} -lt "4" ]] && use_overlayfs='false'
 
-	[[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
+# 	[[ -z ${profile_repo} ]] && profile_repo='manjaro-tools-iso-profiles'
 }
 
 init_deployiso(){
@@ -321,11 +321,11 @@ clean_dir(){
 write_repo_conf(){
 	local repos=$(find $USER_HOME -type f -name ".buildiso")
 	local path name
-
+	[[ -z ${repos[@]} ]] && repos=${DATADIR}/iso-profiles
 	for r in ${repos[@]}; do
 		path=${r%/.*}
 		name=${path##*/}
-		echo run_dir=$path > ${USERCONFDIR}/$name.conf
+		echo "run_dir=$path" > ${USERCONFDIR}/$name.conf
 	done
 }