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

Upgrade from development branch

This commit is contained in:
Bob Mottram 2016-11-12 11:42:27 +00:00
parent 0e2926971e
commit aa3428d54b
2 changed files with 20 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/freedombone-upgrade
View File

@ -41,13 +41,26 @@ FRIENDS_MIRRORS_SERVER=
FRIENDS_MIRRORS_SSH_PORT=2222 FRIENDS_MIRRORS_SSH_PORT=2222
FRIENDS_MIRRORS_PASSWORD= FRIENDS_MIRRORS_PASSWORD=
MY_MIRRORS_PASSWORD= MY_MIRRORS_PASSWORD=
CURRENT_BRANCH=master
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
read_config_param DEVELOPMENT_BRANCH
# TODO change this after release
DEVELOPMENT_BRANCH=stockholm
write_config_param "DEVELOPMENT_BRANCH" "$DEVELOPMENT_BRANCH"
if [ $DEVELOPMENT_BRANCH ]; then
if [ ${#DEVELOPMENT_BRANCH} -gt 0 ]; then
CURRENT_BRANCH=$DEVELOPMENT_BRANCH
fi
fi
update-ca-certificates update-ca-certificates
@ -55,21 +68,18 @@ read_repo_servers
${PROJECT_NAME}-mirrors ${PROJECT_NAME}-mirrors
if [ ! -d $PROJECT_DIR ]; then if [ ! -d $PROJECT_DIR ]; then
# TODO after stockholm merge change this to git_clone git_clone $PROJECT_REPO $PROJECT_DIR
git clone $PROJECT_REPO $PROJECT_DIR
fi fi
if [ -d $PROJECT_DIR ]; then 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 merge --abort if [[ "$CURRENT_BRANCH" == *"master" ]]; then
git stash git_pull $PROJECT_REPO
# TODO after stockholm merge change this to git_pull else
git checkout master git_pull $PROJECT_REPO origin/$DEVELOPMENT_BRANCH
git pull $PROJECT_REPO fi
git checkout stockholm
git pull $PROJECT_REPO origin/stockholm
make install make install
${PROJECT_NAME} -c $CONFIGURATION_FILE ${PROJECT_NAME} -c $CONFIGURATION_FILE
fi fi

2
src/freedombone-utils-upgrade
View File

@ -55,7 +55,7 @@ function upgrade_installation_from_previous_versions {
return return
fi fi
# upgrade from previous versions to stockholm # upgrade from previous versions
sed -i 's|configure_email|install_email|g' $COMPLETION_FILE sed -i 's|configure_email|install_email|g' $COMPLETION_FILE
sed -i 's|install_dlna_server|install_dlna|g' $COMPLETION_FILE sed -i 's|install_dlna_server|install_dlna|g' $COMPLETION_FILE
sed -i 's|install_gnu_social_theme|install_gnusocial_theme|g' $COMPLETION_FILE sed -i 's|install_gnu_social_theme|install_gnusocial_theme|g' $COMPLETION_FILE