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

Fix install issues

Browse source
This commit is contained in:
Josué Tille 2021-04-04 12:48:21 +02:00
parent e661e994fa
commit 214e74a7b5
No known key found for this signature in database
GPG key ID: 716A6C99B04194EF
3 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
scripts/_common.sh
View file

@ -22,10 +22,16 @@ setup_dir() {
install_source() { install_source() {
# Clean venv is it was on python with an old version in case major upgrade of debian # Clean venv is it was on python with an old version in case major upgrade of debian
if [ ! -e $final_path/lib/python$python_version ]; then if [ ! -e $final_path/lib/python$python_version ]; then
ynh_secure_remove --file=$final_path ynh_secure_remove --file=$final_path/bin
ynh_secure_remove --file=$final_path/lib
ynh_secure_remove --file=$final_path/lib64
ynh_secure_remove --file=$final_path/include
ynh_secure_remove --file=$final_path/share
ynh_secure_remove --file=$final_path/pyvenv.cfg
fi fi
mkdir -p $final_path mkdir -p $final_path
chown $pgadmin_user:root -R $final_path
if [ -n "$(uname -m | grep arm)" ] if [ -n "$(uname -m | grep arm)" ]
then then
@ -40,9 +46,9 @@ install_source() {
# We need this to be able to install cryptgraphy # We need this to be able to install cryptgraphy
export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin" export PATH="$PATH:$final_path/.cargo/bin:$final_path/.local/bin:/usr/local/sbin"
if [ -e $final_path/.rustup ]; then if [ -e $final_path/.rustup ]; then
sudo -u "$synapse_user" env PATH=$PATH rustup update sudo -u "$pgadmin_user" env PATH=$PATH rustup update
else else
sudo -u "$synapse_user" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable' sudo -u "$pgadmin_user" bash -c 'curl -sSf -L https://static.rust-lang.org/rustup.sh | sh -s -- -y --default-toolchain=stable'
fi fi
# Install virtualenv if it don't exist # Install virtualenv if it don't exist

2
scripts/install
View file

@ -63,7 +63,7 @@ ynh_install_app_dependencies $dependances
# Create user # Create user
ynh_script_progression --message="Configuring system user..." ynh_script_progression --message="Configuring system user..."
ynh_system_user_create --username $pgadmin_user --home_dir /var/lib/$app ynh_system_user_create --username $pgadmin_user --home_dir $final_path
# Download, check integrity, uncompress and patch the source from app.src # Download, check integrity, uncompress and patch the source from app.src
ynh_script_progression --message="Installing sources files..." --weight=10 ynh_script_progression --message="Installing sources files..." --weight=10

4
scripts/upgrade
View file

@ -33,6 +33,10 @@ ynh_clean_setup () {
test -e /etc/uwsgi/apps-available/$app.ini && \ test -e /etc/uwsgi/apps-available/$app.ini && \
ynh_systemd_action --service_name "uwsgi-app@$app.service" --action stop ynh_systemd_action --service_name "uwsgi-app@$app.service" --action stop
if ! grep -q "$final_path" /etc/passwd; then
sed --in-place -r "s@$app\:x\:([[:digit:]]+\:[[:digit:]]+)\:\:/.*/$app\:/usr/sbin/nologin@$app\:x\:\1\:\:$final_path\:/usr/sbin/nologin@g" /etc/passwd
fi
#================================================= #=================================================
# STANDARD UPGRADE STEPS # STANDARD UPGRADE STEPS
#================================================= #=================================================