1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/etherpad_ynh.git synced 2024-09-03 18:36:10 +02:00
This commit is contained in:
Éric Gaspar 2023-09-09 11:33:22 +02:00
parent ac86cc9dac
commit 4d96db40eb
2 changed files with 6 additions and 10 deletions

View file

@ -43,7 +43,6 @@ ynh_script_progression --message="Installing $app..." --weight=60
pushd $install_dir pushd $install_dir
ynh_use_nodejs ynh_use_nodejs
#ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH src/bin/run.sh
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
popd popd
@ -52,10 +51,10 @@ popd
#================================================= #=================================================
ynh_script_progression --message="Configuring $app..." --weight=6 ynh_script_progression --message="Configuring $app..." --weight=6
cp ../conf/settings.json $install_dir/settings.json ynh_add_config --template="../conf/settings.json" --destination="$install_dir/settings.json"
chmod 400 "$install_dir/settings.json"
chown $app:$app "$install_dir/settings.json"
ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$install_dir/settings.json"
ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$install_dir/settings.json"
if [ "$export" = "abiword" ] if [ "$export" = "abiword" ]
then then
# Get AbiWord binary path # Get AbiWord binary path
@ -72,8 +71,8 @@ fi
ynh_store_file_checksum --file="$install_dir/settings.json" ynh_store_file_checksum --file="$install_dir/settings.json"
ynh_add_config --template="../conf/credentials.json" --destination="$install_dir/credentials.json" ynh_add_config --template="../conf/credentials.json" --destination="$install_dir/credentials.json"
chmod 400 "$install_dir/credentials.json"
chmod 400 $install_dir/credentials.json chown $app:$app "$install_dir/credentials.json"
#================================================= #=================================================
# SETUP SYSTEMD # SETUP SYSTEMD

View file

@ -32,7 +32,7 @@ if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_script_progression --message="Upgrading source files..." --weight=1 ynh_script_progression --message="Upgrading source files..." --weight=1
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_setup_source --dest_dir="$install_dir" --keep="$install_dir/settings.json $install_dir/credentials.json" ynh_setup_source --dest_dir="$install_dir" --keep="settings.json credentials.json"
fi fi
chmod -R o-rwx "$install_dir" chmod -R o-rwx "$install_dir"
@ -63,10 +63,7 @@ ynh_script_progression --message="Installing $app..." --weight=90
pushd $install_dir pushd $install_dir
ynh_use_nodejs ynh_use_nodejs
#ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" src/bin/run.sh
ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH bin/installDeps.sh
#ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" npm cache clean --force
#ynh_exec_warn_less ynh_exec_as $app env "$ynh_node_load_PATH" npm install --upgrade
popd popd
#================================================= #=================================================