From 9a7f5fbe55b290e159bd8633979e3a0f53bb7a17 Mon Sep 17 00:00:00 2001 From: dodgejcr Date: Sat, 8 Feb 2020 23:50:17 -0600 Subject: [PATCH] fix arm profile setup if it already exists --- manjaro-arm-installer | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/manjaro-arm-installer b/manjaro-arm-installer index 785eb19..7f46154 100755 --- a/manjaro-arm-installer +++ b/manjaro-arm-installer @@ -96,14 +96,16 @@ show_elapsed_time(){ getarmprofiles () { info "Getting package lists ready for $DEVICE $EDITION edition..." - if ls $TMPDIR/arm-profiles/* 1> /dev/null 2>&1; then + + if [ -d "$TMPDIR/arm-profiles/" ]; + then cd $TMPDIR/arm-profiles - git pull 1> /dev/null 2>&1 + git fetch origin 1> /dev/null 2>&1 + git reset --hard origin/master 1> /dev/null 2>&1 else mkdir -p $TMPDIR chmod 777 $TMPDIR - cd $TMPDIR - git clone https://gitlab.manjaro.org/manjaro-arm/applications/arm-profiles.git 1> /dev/null 2>&1 + git clone https://gitlab.manjaro.org/manjaro-arm/applications/arm-profiles.git $TMPDIR/arm-profiles/ 1> /dev/null 2>&1 fi }