Add init profiles repo functions

bin/buildiso.in

@@ -9,14 +9,13 @@
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 
-version=@version@
+version=0.15.9
 
-LIBDIR='@libdir@'
-DATADIR='@datadir@'
-SYSCONFDIR='@sysconfdir@'
+LIBDIR='/usr/lib/manjaro-tools'
+DATADIR='/usr/share/manjaro-tools'
+SYSCONFDIR='/etc/manjaro-tools'
 
 [[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
-
 import ${LIBDIR}/util.sh
 
 show_profile(){
@@ -56,6 +55,7 @@ display_settings(){
     show_config
 
     msg "PROFILE:"
+    msg2 "gitlab brach: %s" "${branch}"
     msg2 "build_lists: %s" "$(show_build_lists ${list_dir_iso})"
     msg2 "build_list_iso: %s" "${build_list_iso}"
     msg2 "is_build_list: %s" "${is_build_list}"
@@ -89,6 +89,8 @@ load_user_info
 
 load_config "${USERCONFDIR}/manjaro-tools.conf" || load_config "${SYSCONFDIR}/manjaro-tools.conf"
 
+init_profiles 
+
 # to force old way to have buildiso run in iso-profiles dir
 # run_dir=$(pwd)
 

lib/util.sh

@@ -317,6 +317,8 @@ init_buildiso(){
 
     [[ -z ${kernel} ]] && kernel="linux414"
     
+    [[ -z ${branch} ]] && branch="v17.1" #current branch release
+
     [[ -z ${gpgkey} ]] && gpgkey=''
 
     mhwd_repo="/opt/pkg"
@@ -386,7 +388,7 @@ load_profile_config(){
     [[ -z ${login_shell} ]] && login_shell='/bin/bash'
 
     if [[ -z ${addgroups} ]]; then
-        addgroups="audio,disk,lp,network,optical,power,scanner,storage,video,wheel"
+        addgroups="lp,network,power,sys,wheel"
     fi
 
     if [[ -z ${enable_systemd[@]} ]]; then
@@ -764,3 +766,20 @@ create_chksums() {
     sha1sum $1 > $1.sha1
     sha256sum $1 > $1.sha256
 }
+
+init_profiles() {	
+	_workdir='/usr/share/manjaro-tools'
+	if [[ -d ${_workdir}/iso-profiles ]]; then
+		rm -Rf ${_workdir}/iso-profiles ]]
+	fi
+	git clone -q --depth 1 -b ${branch} https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git ${_workdir}/iso-profiles/
+	
+	for i in ${_workdir}/iso-profiles/.gitignore ${_workdir}/iso-profiles/README.md; do
+		rm -f $i
+	done
+		
+	for i in ${_workdir}/iso-profiles/.git ${_workdir}/iso-profiles/sonar; do
+		rm -Rf $i
+	done
+}
+