v0.13.1

Makefile

@@ -1,4 +1,4 @@
-Version=0.13-dev
+Version=0.13.1
 
 PREFIX = /usr/local
 SYSCONFDIR = /etc

bin/buildpkg.in

@@ -151,7 +151,7 @@ eval_build_list "${list_dir_pkg}" "${build_list_pkg}"
 
 prepare_dir "${pkg_dir}"
 
-chown ${OWNER}:${OWNER} "${pkg_dir}"
+chown ${OWNER}:$(id --group ${OWNER}) "${pkg_dir}"
 
 init_base_devel
 

lib/util-iso-calamares.sh

@@ -195,6 +195,8 @@ write_settings_conf(){
 			echo "  - networkcfg" >> "$conf"
 			echo "  - packages" >> "$conf"
 		else
+			# take out networkcfg once a new PR has been merged
+			echo "  - networkcfg" >> "$conf"
 			echo "  - chrootcfg" >> "$conf"
 		fi
 	else
@@ -233,19 +235,25 @@ write_settings_conf(){
 write_chrootcfg_conf(){
 	local conf="$1/etc/calamares/modules/chrootcfg.conf"
 	echo "---" > "$conf"
-	echo "requirements:" >> "$conf"
+	echo "directories:" >> "$conf"
-	echo "    - directory: /etc" >> "$conf"
+	echo "    - name: /etc" >> "$conf"
-	echo "    - directory: /var/log" >> "$conf"
+	echo "      mode: 755" >> "$conf"
-	echo "    - directory: /var/cache/pacman/pkg" >> "$conf"
+	echo "    - name: /var/log" >> "$conf"
-	echo "    - directory: /var/lib/pacman" >> "$conf"
+	echo "      mode: 755" >> "$conf"
+	echo "    - name: /var/cache/pacman/pkg" >> "$conf"
+	echo "      mode: 755" >> "$conf"
+	echo "    - name: /var/lib/pacman" >> "$conf"
+	echo "      mode: 755" >> "$conf"
 	echo '' >> "$conf"
-	echo "packages:" >> "$conf"
+	echo "requirements:" >> "$conf"
 	echo "    - pacman" >> "$conf"
 	echo "    - ${kernel}" >> "$conf"
 	echo '' >> "$conf"
 	echo "keyrings:" >> "$conf"
 	echo "    - archlinux" >> "$conf"
 	echo "    - manjaro" >> "$conf"
+	echo '' >> "$conf"
+	echo "branch: ${target_branch}" >> "$conf"
 }
 
 write_netinstall_conf(){

lib/util-iso-image.sh

@@ -65,12 +65,13 @@ configure_environment(){
 	case ${profile} in
 		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 's|QT_STYLE_OVERRIDE=gtk|QT_STYLE_OVERRIDE=gtk2|g' $1/etc/environment
-			fi
 			if [[ -f "$1/usr/lib/qt/plugins/platformthemes/libqt5ct.so" ]];then
-				echo "QT_QPA_PLATFORMTHEME=qt5ct" >> $1/etc/environment
 				sed -i '/QT_STYLE_OVERRIDE=gtk/d' $1/etc/environment
+				echo "QT_QPA_PLATFORMTHEME=qt5ct" >> $1/etc/environment
+			fi
+			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
 		;;
 	esac
@@ -297,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 '# Virtual memory setting (swap file or partition)' > ${conf}
-	echo 'vm.swappiness = 30' >> ${conf}
+# 	echo 'vm.swappiness = 30' >> ${conf}
 	echo '# Enable the SysRq key' >> ${conf}
 	echo 'kernel.sysrq = 1' >> ${conf}
 }

lib/util-iso.sh

@@ -611,7 +611,7 @@ compress_images(){
 	make_checksum "${iso_file}"
 	${sign} && sign_iso "${iso_file}"
 	${torrent} && make_torrent
-	chown -R "${OWNER}:${OWNER}" "${iso_dir}"
+	chown -R "${OWNER}:$(id --group ${OWNER})" "${iso_dir}"
 	show_elapsed_time "${FUNCNAME}" "${timer}"
 }
 

lib/util-pkg.sh

@@ -250,7 +250,7 @@ move_to_cache(){
 	mv $src ${pkg_dir}/
 	${sign} && sign_pkg "${src##*/}"
 	[[ -n $PKGDEST ]] && rm "$1"
-	chown -R "${OWNER}:${OWNER}" "${pkg_dir}"
+	chown -R "${OWNER}:$(id --group ${OWNER})" "${pkg_dir}"
 }
 
 archive_logs(){