YunoHost-Apps/lemmy_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/lemmy_ynh.git synced 2024-09-03 19:36:09 +02:00
Code Issues Activity Actions

less warnings

Browse source
This commit is contained in:
yalh76 2021-07-30 20:15:04 +02:00
parent 6e7e9e3a20
commit e50af4b463
3 changed files with 23 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
scripts/install
View file

@ -78,10 +78,10 @@ ynh_app_setting_set --app=$app --key=port_iframely --value=$port_iframely
#================================================= #=================================================
ynh_script_progression --message="Installing dependencies..." ynh_script_progression --message="Installing dependencies..."
ynh_install_app_dependencies $pkg_dependencies $pkg_build_dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $pkg_build_dependencies
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_use_nodejs ynh_use_nodejs
ln -s /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1 ln -fs /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
#================================================= #=================================================
# CREATE DEDICATED USER # CREATE DEDICATED USER
@ -169,10 +169,10 @@ ynh_secure_remove --file="$final_path/build-lemmy-ui"
# Install ImageMagick # Install ImageMagick
pushd "$final_path/build-imagemagick/" pushd "$final_path/build-imagemagick/"
./configure --with-modules ynh_exec_warn_less ./configure --with-modules
make ynh_exec_warn_less make
make install ynh_exec_warn_less make install
ldconfig /usr/local/lib ynh_exec_warn_less ldconfig /usr/local/lib
popd popd
ynh_secure_remove --file="$final_path/build-imagemagick" ynh_secure_remove --file="$final_path/build-imagemagick"
@ -201,7 +201,7 @@ mkdir -p "$final_path/iframely/"
rsync -a "$final_path/build-iframely/output/iframely/" "$final_path/iframely/" rsync -a "$final_path/build-iframely/output/iframely/" "$final_path/iframely/"
ynh_secure_remove --file="$final_path/build-iframely" ynh_secure_remove --file="$final_path/build-iframely"
ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
chmod 750 "$final_path" chmod 750 "$final_path"
chmod -R o-rwx "$final_path" chmod -R o-rwx "$final_path"
chown -R $app:$app "$final_path" chown -R $app:$app "$final_path"

7
scripts/restore
View file

@ -94,9 +94,10 @@ chown -R $app:$app "$datadir"
ynh_script_progression --message="Reinstalling dependencies..." ynh_script_progression --message="Reinstalling dependencies..."
# Define and install dependencies # Define and install dependencies
ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_use_nodejs ynh_use_nodejs
ln -fs /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
#================================================= #=================================================
# BUILDING IMAGEMAGICK # BUILDING IMAGEMAGICK
@ -105,6 +106,8 @@ ynh_script_progression --message="Building ImageMagick..."
ynh_setup_source --dest_dir="$final_path/build-imagemagick/" --source_id="imagemagick" ynh_setup_source --dest_dir="$final_path/build-imagemagick/" --source_id="imagemagick"
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $imagemagick_build_dependencies
# Install ImageMagick # Install ImageMagick
pushd "$final_path/build-imagemagick/" pushd "$final_path/build-imagemagick/"
./configure --with-modules ./configure --with-modules
@ -114,6 +117,8 @@ pushd "$final_path/build-imagemagick/"
popd popd
ynh_secure_remove --file="$final_path/build-imagemagick" ynh_secure_remove --file="$final_path/build-imagemagick"
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
#================================================= #=================================================
# RESTORE THE POSTGRESQL DATABASE # RESTORE THE POSTGRESQL DATABASE
#================================================= #=================================================

15
scripts/upgrade
View file

@ -131,9 +131,10 @@ ynh_add_nginx_config
#================================================= #=================================================
ynh_script_progression --message="Upgrading dependencies..." ynh_script_progression --message="Upgrading dependencies..."
ynh_install_app_dependencies $pkg_dependencies ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
ynh_install_nodejs --nodejs_version=$NODEJS_VERSION ynh_install_nodejs --nodejs_version=$NODEJS_VERSION
ynh_use_nodejs ynh_use_nodejs
ln -fs /usr/lib/x86_64-linux-musl/libc.so /lib/libc.musl-x86_64.so.1
#================================================= #=================================================
# SPECIFIC UPGRADE # SPECIFIC UPGRADE
@ -144,6 +145,8 @@ ynh_script_progression --message="Making upgrade..."
if [ "$upgrade_type" == "UPGRADE_APP" ] if [ "$upgrade_type" == "UPGRADE_APP" ]
then then
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies $pkg_build_dependencies
# Install lemmy # Install lemmy
pushd $final_path/build-lemmy pushd $final_path/build-lemmy
./docker-image-extract dessalines/lemmy:$LEMMY_VERSION ./docker-image-extract dessalines/lemmy:$LEMMY_VERSION
@ -162,10 +165,10 @@ then
# Install ImageMagick # Install ImageMagick
pushd "$final_path/build-imagemagick/" pushd "$final_path/build-imagemagick/"
./configure --with-modules ynh_exec_warn_less ./configure --with-modules
make ynh_exec_warn_less make
make install ynh_exec_warn_less make install
ldconfig /usr/local/lib ynh_exec_warn_less ldconfig /usr/local/lib
popd popd
ynh_secure_remove --file="$final_path/build-imagemagick" ynh_secure_remove --file="$final_path/build-imagemagick"
@ -193,6 +196,8 @@ then
mkdir -p "$final_path/iframely/" mkdir -p "$final_path/iframely/"
rsync -a "$final_path/build-iframely/output/iframely/" "$final_path/iframely/" rsync -a "$final_path/build-iframely/output/iframely/" "$final_path/iframely/"
ynh_secure_remove --file="$final_path/build-iframely" ynh_secure_remove --file="$final_path/build-iframely"
ynh_exec_warn_less ynh_install_app_dependencies $pkg_dependencies
fi fi
chmod 750 "$final_path" chmod 750 "$final_path"