[util-iso-image] with qt5ct 0.25 QT_STYLE_OVERRIDE needs to be removed

- don't assume that the primary group of a user is named the same as the user itself
- fixes https://github.com/manjaro/manjaro-tools/issues/248

Makefile

@@ -1,4 +1,4 @@
-Version=0.12.1
+Version=0.12.4
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc

README.md

@@ -1,7 +1,7 @@
 manjaro-tools
 =============
 
-Manjaro-tools-0.12.0
+Manjaro-tools-0.12
 
 User manual
 

bin/buildiso.in

@@ -168,16 +168,12 @@ 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[@]}"
 
+prepare_dir "${log_dir}"
+
 prepare_dir "${tmp_dir}"
 
 eval_build_list "${list_dir_iso}" "${build_list_iso}"
@@ -186,6 +182,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}"

bin/buildpkg.in

@@ -133,6 +133,8 @@ shift $(($OPTIND - 1))
 
 check_root "$0" "${orig_argv[@]}"
 
+prepare_dir "${log_dir}"
+
 prepare_dir "${tmp_dir}"
 
 prepare_conf "${target_arch}"
@@ -149,6 +151,8 @@ eval_build_list "${list_dir_pkg}" "${build_list_pkg}"
 
 prepare_dir "${pkg_dir}"
 
+chown ${OWNER}:$(id --group ${OWNER}) "${pkg_dir}"
+
 init_base_devel
 
 ${pretend} && display_settings && exit

lib/util-iso-image.sh

@@ -63,8 +63,16 @@ add_svc_sd(){
 # $1: chroot
 configure_environment(){
 	case ${profile} in
-		cinnamon*|gnome|i3|lxde|mate|netbook|openbox|pantheon|xfce*)
+		cinnamon*|deepin*|gnome|i3|lxde|mate|netbook|openbox|pantheon|xfce*)
 			echo "QT_STYLE_OVERRIDE=gtk" >> $1/etc/environment
+			if [[ -f "$1/usr/lib/qt/plugins/styles/libqgtk2style.so" ]];then
+				sed -i '/QT_STYLE_OVERRIDE=gtk/d' $1/etc/environment
+				echo "QT_STYLE_OVERRIDE=gtk2" >> $1/etc/environment
+			fi
+			if [[ -f "$1/usr/lib/qt/plugins/platformthemes/libqt5ct.so" ]];then
+				sed -i '/QT_STYLE_OVERRIDE=gtk/d' $1/etc/environment
+				echo "QT_QPA_PLATFORMTHEME=qt5ct" >> $1/etc/environment
+			fi
 		;;
 	esac
 }
@@ -290,8 +298,8 @@ configure_sysctl(){
 	msg2 "Configuring sysctl ..."
 	touch $1/etc/sysctl.conf
 	local conf=$1/etc/sysctl.d/100-manjaro.conf
-	echo '# Virtual memory setting (swap file or partition)' > ${conf}
-	echo 'vm.swappiness = 30' >> ${conf}
+# 	echo '# Virtual memory setting (swap file or partition)' > ${conf}
+# 	echo 'vm.swappiness = 30' >> ${conf}
 	echo '# Enable the SysRq key' >> ${conf}
 	echo 'kernel.sysrq = 1' >> ${conf}
 }
@@ -374,6 +382,7 @@ configure_custom_image(){
 	configure_plymouth "$1"
 	[[ ${displaymanager} != 'none' ]] && configure_displaymanager "$1"
 	configure_services "$1"
+	configure_environment "$1"
 	msg "Done configuring [%s-image]" "${profile}"
 }
 
@@ -383,7 +392,6 @@ configure_live_image(){
 	configure_user "$1"
 	configure_accountsservice "$1" "${username}"
 	configure_pamac_live "$1"
-	configure_environment "$1"
 	case ${initsys} in
 		'systemd')
 			configure_logind_live "$1"

lib/util-iso.sh

@@ -586,6 +586,7 @@ check_requirements(){
 	else
 		iso_fs="aufs"
 	fi
+	import ${LIBDIR}/util-iso-${iso_fs}.sh
 }
 
 sign_iso(){
@@ -596,7 +597,7 @@ compress_images(){
 	local timer=$(get_timer)
 	run_safe "make_iso"
 	make_checksum "${iso_file}"
-	chown -R "${OWNER}:users" "${iso_dir}"
+	chown -R "${OWNER}:$(id --group ${OWNER})" "${iso_dir}"
 	${sign} && sign_iso "${iso_file}"
 	show_elapsed_time "${FUNCNAME}" "${timer}"
 }
@@ -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-pkg.sh

@@ -249,6 +249,7 @@ move_to_cache(){
 	msg2 "Moving [%s] -> [%s]" "${src##*/}" "${pkg_dir}"
 	mv $src ${pkg_dir}/
 	${sign} && sign_pkg "${src##*/}"
+	[[ -n $PKGDEST ]] && rm "$1"
 	chown -R "${OWNER}:users" "${pkg_dir}"
 }