diff --git a/abra b/abra index f94c4a5..1f2447e 100755 --- a/abra +++ b/abra @@ -298,7 +298,7 @@ warning() { } success() { - echo "$(tput setaf 2)$*$(tput sgr0)" + echo "$(tput setaf 2)SUCCESS: $*$(tput sgr0)" } ###### Default settings @@ -325,16 +325,19 @@ require_stack() { fi } -require_app_clone() { +require_app_latest() { APP="$1" APP_DIR="$ABRA_DIR/apps/$APP" if [ ! -d "$APP_DIR" ]; then - warning "'$APP' not found, fetching via git.." - if ! git clone "$GIT_URL/$APP.git" "$ABRA_DIR/apps/$APP"; then - error "Could not retrieve '$APP', this app doesn't exist?" + warning "The app type '$APP' was not found, fetching via Git" + if ! git clone "$GIT_URL/$APP.git" "$ABRA_DIR/apps/$APP" > /dev/null 2>&1 ; then + error "Could not retrieve app type '$APP', this app type doesn't exist?" fi + success "Fetched app configuration via Git" fi + + cd "$APP_DIR" && git pull > /dev/null 2>&1 } # FIXME 3wc: update or remove @@ -353,8 +356,6 @@ load_custom_commands() { if [ -n "$abra__domain_" ]; then load_instance load_instance_env - - require_app_clone "$APP" fi if [ -f "$APP_DIR/abra-commands.sh" ]; then @@ -540,7 +541,7 @@ sub_app_new (){ SERVER=$abra___server DOMAIN=$abra___domain - require_app_clone "$APP" + require_app_latest "$APP" if [ -z "$SERVER" ]; then echo "Where would you like to put $APP?" @@ -596,7 +597,7 @@ sub_app_deploy (){ load_instance load_instance_env - require_app_clone "$APP" + require_app_latest "$APP" if [ "$abra___skip_check" == "false" ]; then sub_app_check @@ -622,7 +623,6 @@ sub_app_deploy (){ prompt_confirm APP=$(basename "$APP_DIR") - require_app_clone "$APP" ( cd "$APP_DIR" || error "\$APP_DIR '$APP_DIR' not found"