1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/friendica_ynh.git synced 2024-09-03 18:36:14 +02:00

Merge branch 'testing' into language

This commit is contained in:
ericgaspar 2021-07-19 11:46:15 +02:00
commit 2dfc18f601
No known key found for this signature in database
GPG key ID: 574F281483054D44

View file

@ -110,9 +110,9 @@ ynh_system_user_create --username=$app --home_dir="$final_path"
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Upgrading source files..." --weight=3
# Check if the repo can be updated with git # Check if the repo can be updated with git
if [ `cd $final_path && git rev-parse --is-inside-work-tree` ]; if [ `cd $final_path && git rev-parse --is-inside-work-tree &> /dev/null` ];
then then
# Update through Git # Update through Git
pushd "$final_path" pushd "$final_path"
@ -132,7 +132,6 @@ else
# Create a temporary directory and backup smarty3 folder # Create a temporary directory and backup smarty3 folder
tmpdir="$(mktemp -d)" tmpdir="$(mktemp -d)"
ynh_script_progression --message="Upgrading source files..." --weight=3
cp -a "$final_path/view/smarty3" "$tmpdir/smarty3" cp -a "$final_path/view/smarty3" "$tmpdir/smarty3"
# Remove the app directory securely # Remove the app directory securely