buildiso: import fixes

create log_dir after it was set

bin/buildiso.in

@@ -168,12 +168,6 @@ done
 
 shift $(($OPTIND - 1))
 
-for sig in TERM HUP QUIT; do
-	trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
-done
-trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
-trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
-
 timer_start=$(get_timer)
 
 check_root "$0" "${orig_argv[@]}"
@@ -186,6 +180,12 @@ import ${LIBDIR}/util-iso.sh
 
 check_requirements
 
+for sig in TERM HUP QUIT; do
+	trap "trap_exit $sig \"$(gettext "%s signal caught. Exiting...")\" \"$sig\"" "$sig"
+done
+trap 'trap_exit INT "$(gettext "Aborted by user! Exiting...")"' INT
+trap 'trap_exit USR1 "$(gettext "An unknown error has occurred. Exiting...")"' ERR
+
 ${pretend} && display_settings && exit 1
 
 run build "${build_list_iso}"

lib/util-iso.sh

@@ -586,6 +586,7 @@ check_requirements(){
 	else
 		iso_fs="aufs"
 	fi
+	import ${LIBDIR}/util-iso-${iso_fs}.sh
 }
 
 sign_iso(){
@@ -638,7 +639,6 @@ prepare_images(){
 
 make_profile(){
 	msg "Start building [%s]" "${profile}"
-	import ${LIBDIR}/util-iso-${iso_fs}.sh
 	${clean_first} && chroot_clean "${work_dir}"
 	if ${iso_only}; then
 		[[ ! -d ${work_dir} ]] && die "Create images: buildiso -p %s -x" "${profile}"
@@ -694,7 +694,6 @@ load_profile(){
 	iso_dir="${cache_dir_iso}/${edition}/${profile}/${dist_release}/${target_arch}"
 
 	prepare_dir "${iso_dir}"
-	prepare_dir "${log_dir}"
 }
 
 prepare_profile(){

lib/util.sh

@@ -230,6 +230,8 @@ init_common(){
 
 	[[ -z ${log_dir} ]] && log_dir='/var/log/manjaro-tools'
 
+	prepare_dir "${log_dir}"
+
 	[[ -z ${build_mirror} ]] && build_mirror='http://mirror.netzspielplatz.de/manjaro/packages'
 
 	[[ -z ${tmp_dir} ]] && tmp_dir='/tmp/manjaro-tools'