From 4db29f0f6200b51c33696f8bf17815cc275e31a0 Mon Sep 17 00:00:00 2001 From: Limezy Date: Thu, 9 Jun 2022 00:35:07 +0700 Subject: [PATCH] change build directory to binaries --- conf/systemd.service | 2 +- scripts/install | 11 +++++------ scripts/upgrade | 11 +++++------ 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/conf/systemd.service b/conf/systemd.service index 7b541f4..dd440b7 100644 --- a/conf/systemd.service +++ b/conf/systemd.service @@ -7,7 +7,7 @@ Type=simple User=__APP__ Group=__APP__ WorkingDirectory=__FINALPATH__/ -ExecStart=__FINALPATH__/build/bin/photoprism --config-path __FINALPATH__/build/config/ --trace start +ExecStart=__FINALPATH__/binaries/bin/photoprism --config-path __FINALPATH__/binaries/config/ --trace start StandardOutput=append:/var/log/__APP__/__APP__.log StandardError=inherit diff --git a/scripts/install b/scripts/install index eeda0f3..a2c0d73 100755 --- a/scripts/install +++ b/scripts/install @@ -149,8 +149,7 @@ pushd "$final_path" # Setup node environment export NODE_OPTIONS=--max_old_space_size=1024 # Build server from source - ynh_secure_remove --file="$final_path/build" - make all install DESTDIR=$final_path/build 2>&1 + make all install DESTDIR=$final_path/binaries 2>&1 ynh_secure_remove --file="$final_path/go" popd @@ -164,7 +163,7 @@ ynh_app_setting_set --app=$app --key=datadir --value=$datadir mkdir -p $datadir mkdir "$datadir/assets/" -mv "$final_path/build/assets/"* "$datadir/assets/" +mv "$final_path/binaries/assets/"* "$datadir/assets/" chmod 750 "$datadir" chmod -R o-rwx "$datadir" @@ -176,9 +175,9 @@ chown -R $app:www-data "$datadir" #================================================= ynh_script_progression --message="Adding a configuration file..." --time --weight=1 -ynh_add_config --template="options.yml" --destination="$final_path/build/config/options.yml" -chmod 400 "$final_path/build/config/options.yml" -chown $app:$app "$final_path/build/config/options.yml" +ynh_add_config --template="options.yml" --destination="$final_path/binaries/config/options.yml" +chmod 400 "$final_path/binaries/config/options.yml" +chown $app:$app "$final_path/binaries/config/options.yml" #================================================= # SETUP SYSTEMD diff --git a/scripts/upgrade b/scripts/upgrade index 639a28d..e98140c 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -121,8 +121,7 @@ pushd "$final_path" # Setup node environment export NODE_OPTIONS=--max_old_space_size=1024 # Build server from source - ynh_secure_remove --file="$final_path/build" - make all install DESTDIR=$final_path/build 2>&1 + make all install DESTDIR=$final_path/binaries 2>&1 ynh_secure_remove --file="$final_path/go" popd @@ -133,7 +132,7 @@ ynh_script_progression --message="Updating data directory..." --time --weight=1 ynh_secure_remove --file="$datadir/assets" mkdir "$datadir/assets/" -mv "$final_path/build/assets/"* "$datadir/assets/" +mv "$final_path/binaries/assets/"* "$datadir/assets/" chmod 750 "$datadir" chmod -R o-rwx "$datadir" @@ -144,9 +143,9 @@ chown -R $app:www-data "$datadir" #================================================= ynh_script_progression --message="Updating a configuration file..." --time --weight=1 -ynh_add_config --template="options.yml" --destination="$final_path/build/config/options.yml" -chmod 400 "$final_path/build/config/options.yml" -chown $app:$app "$final_path/build/config/options.yml" +ynh_add_config --template="options.yml" --destination="$final_path/binaries/config/options.yml" +chmod 400 "$final_path/binaries/config/options.yml" +chown $app:$app "$final_path/binaries/config/options.yml" #================================================= # SETUP SYSTEMD