diff --git a/scripts/_common.sh b/scripts/_common.sh index 3b36634..5d74bd4 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -14,8 +14,9 @@ pkg_dependencies="acl nim libsass-dev" function build_nitter { pushd "$final_path" || ynh_die chown -R $app:$app $final_path - sudo -u $app env "PATH=/opt/yunohost/$app/nim-installation/bin:$(sudo -u $app sh -c 'echo $PATH')" nimble build -d:release -y - sudo -u $app env "PATH=/opt/yunohost/$app/nim-installation/bin:$(sudo -u $app sh -c 'echo $PATH')" nimble scss -y + sudo -u $app env "PATH=/opt/yunohost/$app/nim-installation/bin:$(sudo -u $app sh -c 'echo $PATH')" nimble build -d:release -y -d:danger --passC:"-flto" --passL:"-flto" 2>&1 + sudo -u $app env "PATH=/opt/yunohost/$app/nim-installation/bin:$(sudo -u $app sh -c 'echo $PATH')" strip -s nitter 2>&1 + sudo -u $app env "PATH=/opt/yunohost/$app/nim-installation/bin:$(sudo -u $app sh -c 'echo $PATH')" nimble scss -y 2>&1 mkdir -p $final_path/tmp chown -R root:root $final_path popd || ynh_die diff --git a/scripts/install b/scripts/install index 39324c2..592923b 100755 --- a/scripts/install +++ b/scripts/install @@ -99,7 +99,8 @@ ynh_script_progression --message="Setting up source files..." --weight=1 ynh_app_setting_set --app=$app --key=final_path --value=$final_path # Download, check integrity, uncompress and patch the source from app.src -ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" +ynh_setup_source --dest_dir="$final_path" --source_id="app" +ynh_setup_source --dest_dir="$final_path/nim-installation" --source_id="$architecture" #================================================= # NGINX CONFIGURATION diff --git a/scripts/upgrade b/scripts/upgrade index c49f52e..f754157 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -70,7 +70,8 @@ then # Download, check integrity, uncompress and patch the source from app.src mv "$final_path/nitter.conf" "$final_path/nitter.conf.bak" - ynh_setup_source --dest_dir="$final_path" --source_id="$architecture" + ynh_setup_source --dest_dir="$final_path" --source_id="app" + ynh_setup_source --dest_dir="$final_path/nim-installation" --source_id="$architecture" mv "$final_path/nitter.conf.bak" "$final_path/nitter.conf" fi