free
/
freedombonee
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move checkout

This commit is contained in:
Bob Mottram 2016-11-12 11:06:51 +00:00
parent 17501e8acc
commit 7121c60452
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/freedombone-app-hubzilla
View File

@ -202,6 +202,7 @@ function upgrade_hubzilla {
set_repo_commit $HUBZILLA_PATH/addon "hubzilla addons commit" "$HUBZILLA_ADDONS_COMMIT" $HUBZILLA_ADDONS_REPO set_repo_commit $HUBZILLA_PATH/addon "hubzilla addons commit" "$HUBZILLA_ADDONS_COMMIT" $HUBZILLA_ADDONS_REPO
if [ -d $HUBZILLA_PATH/redmatrix-themes1 ]; then if [ -d $HUBZILLA_PATH/redmatrix-themes1 ]; then
cd $HUBZILLA_PATH/redmatrix-themes1 cd $HUBZILLA_PATH/redmatrix-themes1
git merge --abort
git stash git stash
git pull git pull
cp -r $HUBZILLA_PATH/redmatrix-themes1/* $HUBZILLA_PATH/view/theme/ cp -r $HUBZILLA_PATH/redmatrix-themes1/* $HUBZILLA_PATH/view/theme/

6
src/freedombone-upgrade
View File

@ -45,7 +45,7 @@ MY_MIRRORS_PASSWORD=
UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-* UTILS_FILES=/usr/share/${PROJECT_NAME}/utils/${PROJECT_NAME}-utils-*
for f in $UTILS_FILES for f in $UTILS_FILES
do do
source $f source $f
done done
read_config_param PROJECT_REPO read_config_param PROJECT_REPO
@ -63,10 +63,10 @@ if [ -d $PROJECT_DIR ]; then
if [ -f $CONFIGURATION_FILE ]; then if [ -f $CONFIGURATION_FILE ]; then
cd $PROJECT_DIR cd $PROJECT_DIR
rm -rf $PROJECT_DIR/locale/* rm -rf $PROJECT_DIR/locale/*
git checkout stockholm
# TODO after stockholm merge change this to git_pull
git merge --abort git merge --abort
git stash git stash
# TODO after stockholm merge change this to git_pull
git checkout stockholm
git pull $PROJECT_REPO git pull $PROJECT_REPO
make install make install
${PROJECT_NAME} -c $CONFIGURATION_FILE ${PROJECT_NAME} -c $CONFIGURATION_FILE