From 7121c604521ae0002dfccc37bb3417a30a48c701 Mon Sep 17 00:00:00 2001 From: Bob Mottram Date: Sat, 12 Nov 2016 11:06:51 +0000 Subject: [PATCH] Move checkout --- src/freedombone-app-hubzilla | 1 + src/freedombone-upgrade | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/freedombone-app-hubzilla b/src/freedombone-app-hubzilla index 145703f3..bfacb919 100755 --- a/src/freedombone-app-hubzilla +++ b/src/freedombone-app-hubzilla @@ -202,6 +202,7 @@ function upgrade_hubzilla { set_repo_commit $HUBZILLA_PATH/addon "hubzilla addons commit" "$HUBZILLA_ADDONS_COMMIT" $HUBZILLA_ADDONS_REPO if [ -d $HUBZILLA_PATH/redmatrix-themes1 ]; then cd $HUBZILLA_PATH/redmatrix-themes1 + git merge --abort git stash git pull cp -r $HUBZILLA_PATH/redmatrix-themes1/* $HUBZILLA_PATH/view/theme/ diff --git a/src/freedombone-upgrade b/src/freedombone-upgrade index b839f0d9..f254b599 100755 --- a/src/freedombone-upgrade +++ b/src/freedombone-upgrade @@ -45,7 +45,7 @@ MY_MIRRORS_PASSWORD= UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-* for f in $UTILS_FILES do - source $f + source $f done read_config_param PROJECT_REPO @@ -63,10 +63,10 @@ if [ -d $PROJECT_DIR ]; then if [ -f $CONFIGURATION_FILE ]; then cd $PROJECT_DIR rm -rf $PROJECT_DIR/locale/* - git checkout stockholm - # TODO after stockholm merge change this to git_pull git merge --abort git stash + # TODO after stockholm merge change this to git_pull + git checkout stockholm git pull $PROJECT_REPO make install ${PROJECT_NAME} -c $CONFIGURATION_FILE