harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge hell

Browse Source
This commit is contained in:
redmatrix
2015-12-20 14:55:43 -08:00
parent 61fa97baab
commit f23e8f8d41
4 changed files with 50 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
.openshift/action_hooks/deploy
View File

@@ -190,16 +190,16 @@ util/config directory globaldir 1
util/config directory pubforums 0
# Hubzill addons
# echo "Try to add or update Hubzilla addons"
# cd ${OPENSHIFT_REPO_DIR}
# util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons
echo "Try to add or update Hubzilla addons"
cd ${OPENSHIFT_REPO_DIR}
util/add_addon_repo https://github.com/redmatrix/hubzilla-addons.git HubzillaAddons
# Hubzilla themes
# echo "Try to add or update Hubzilla themes"
# cd ${OPENSHIFT_REPO_DIR}
# util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes
echo "Try to add or update Hubzilla themes"
cd ${OPENSHIFT_REPO_DIR}
util/add_theme_repo https://github.com/DeadSuperHero/redmatrix-themes.git DeadSuperHeroThemes
# Hubzilla ownMapp
# echo "Try to add or update Hubzilla ownMapp"
# cd ${OPENSHIFT_REPO_DIR}
# util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp
echo "Try to add or update Hubzilla ownMapp"
cd ${OPENSHIFT_REPO_DIR}
util/add_addon_repo https://gitlab.com/zot/ownmapp.git ownMapp