From 257fe5207504b9347fa3e04a9fd5e5d3f0ba9e6d Mon Sep 17 00:00:00 2001 From: Bernhard Landauer Date: Tue, 28 Feb 2017 17:07:19 +0100 Subject: [PATCH] catch profiles install errors; https://forum.manjaro.org/t/experimental-manjaro-architect-test-iso/17661/77 --- lib/util-desktop.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/util-desktop.sh b/lib/util-desktop.sh index 7cdf718..753ae56 100644 --- a/lib/util-desktop.sh +++ b/lib/util-desktop.sh @@ -305,9 +305,9 @@ install_manjaro_de_wm_pkg() { local pkgs=(manjaro-iso-profiles-{base,official,community}) for p in ${pkgs[@]}; do - pacman -Sy --noconfirm $p + pacman -Sy --noconfirm $p 2>$ERR + check_for_error "update profiles pkgs" $? install_graphics_menu done - check_for_error "update profiles pkgs" install_manjaro_de_wm } @@ -324,11 +324,11 @@ install_manjaro_de_wm_git() { inst_needed git # download manjaro-tools.-isoprofiles git repo if [[ -f $PROFILES ]]; then - git -C $PROFILES pull - check_for_error "pull profiles repo" + git -C $PROFILES pull 2>$ERR + check_for_error "pull profiles repo" $? install_graphics_menu else - git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES - check_for_error "clone profiles repo" + git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES 2>$ERR + check_for_error "clone profiles repo" $? install_graphics_menu fi install_manjaro_de_wm