Skip to content
Extraits de code Groupes Projets
Valider 63b667bb rédigé par Jonne Haß's avatar Jonne Haß
Parcourir les fichiers

gracefully handle unavailable git in script/server

parent 66911801
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -7,6 +7,7 @@
## Bug fixes
* Don't use Pathname early to circumvent some rare initialization errors [#3816](https://github.com/diaspora/diaspora/issues/3816)
* Don't error out in script/server if git is unavailable.
## Features
......
......@@ -103,13 +103,21 @@ fi
# Force AGPL
if [ -w "public" -a ! -e "public/source.tar.gz" ]
then
branch=$(git branch | awk '/^[*]/ {print $2}')
tar czf public/source.tar.gz $(git ls-tree -r $branch | awk '{print $4}')
if command -v git > /dev/null 2>&1 && git rev-parse --is-inside-work-tree > /dev/null 2>&1
then
branch=$(git branch | awk '/^[*]/ {print $2}')
tar czf public/source.tar.gz $(git ls-tree -r $branch | awk '{print $4}')
else
fatal <<MSG
Can't generate public/source.tar.gz for you. Please tar up a copy of
your Diaspora installtion and place it there.
MSG
fi
fi
if [ ! -e "public/source.tar.gz" ]
then
fatal "Can't find, or even create, public/source.tar.gz."
fatal "Can't find public/source.tar.gz"
fi
# Check if assets are precompiled
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter