Commit 1a4a059b authored by Matti Hyttinen's avatar Matti Hyttinen

Use profile-validate

parent 58ee27ff
......@@ -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
......@@ -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
}
......
......@@ -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)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment