diff --git a/bin/manjaro-architect.in b/bin/manjaro-architect.in index 218dd70..c0639d8 100644 --- a/bin/manjaro-architect.in +++ b/bin/manjaro-architect.in @@ -14,7 +14,7 @@ version=@version@ LIBDIR='@libdir@' DATADIR='@datadir@' - +PROFILES="$DATADIR/profiles" [[ -r ${LIBDIR}/util.sh ]] && source ${LIBDIR}/util.sh import ${LIBDIR}/ini_val.sh @@ -51,4 +51,5 @@ else hostcache=true cachepath="/var/cache/pacman/pkg/" fi +profile-validate -r & main_menu diff --git a/lib/util-base.sh b/lib/util-base.sh index 62b165e..a70ea5a 100644 --- a/lib/util-base.sh +++ b/lib/util-base.sh @@ -18,10 +18,12 @@ setup_profiles() { inst_needed git # download manjaro-tools.-isoprofiles git repo if [[ -e $PROFILES ]]; then - git -C $PROFILES pull 2>$ERR + #git -C $PROFILES pull 2>$ERR + profile-validate -r 2>$ERR check_for_error "pull profiles repo" $? else - git clone -b manjaro-architect --depth 1 https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git $PROFILES 2>$ERR + profile-validate -r 2>$ERR + #git clone -b manjaro-architect --depth 1 https://gitlab.manjaro.org/profiles-and-settings/iso-profiles.git $PROFILES 2>$ERR check_for_error "clone profiles repo" $? fi } diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh index 91f78cd..78a2fda 100644 --- a/lib/util-desktop.sh +++ b/lib/util-desktop.sh @@ -241,7 +241,8 @@ install_desktop() { fi # Prep variables touch /tmp/.git_profiles - setup_profiles + #setup_profiles + PROFILES="$DATADIR/profiles" pkgs_src=$PROFILES/shared/Packages-Root pkgs_target=/mnt/.base BTRF_CHECK=$(echo "btrfs-progs" "" off)