YunoHost/yunohost
1
0
Fork 0
mirror of https://github.com/YunoHost/yunohost.git synced 2024-09-03 20:06:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

YNH_APP_HELPERS_DIR -> YNH_HELPERS_DIR

Browse source
This commit is contained in:
Alexandre Aubin 2024-05-27 16:35:38 +02:00
parent 5d3131b494
commit 7011b1c879
3 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
helpers/helpers
View file

@ -2,32 +2,29 @@
# Entrypoint for the helpers scripts # Entrypoint for the helpers scripts
SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
if [[ -n "${1:-}" ]]; then if [[ -n "${1:-}" ]]; then
# helpers version can be passed as first when sourcing. # helpers version can be passed as first when sourcing.
YNH_APP_HELPERS_VERSION="$1" YNH_HELPERS_VERSION="$1"
elif [[ -n "${YNH_APP_HELPERS_VERSION:-}" ]]; then
# ...or as environment variable set from manifest
:
else else
# ...or as environment variable set from manifest
# ...or default to 1 # ...or default to 1
YNH_APP_HELPERS_VERSION=1 YNH_HELPERS_VERSION=${YNH_HELPERS_VERSION:-1}
fi fi
# This is a trick to later only restore set -x if it was set when calling this script # This is a trick to later only restore set -x if it was set when calling this script
readonly XTRACE_ENABLE=$(set +o | grep xtrace) readonly XTRACE_ENABLE=$(set +o | grep xtrace)
set +x set +x
YNH_APP_HELPERS_DIR="$SCRIPT_DIR/helpers.v${YNH_APP_HELPERS_VERSION}.d" YNH_HELPERS_DIR="$SCRIPT_DIR/helpers.v${YNH_HELPERS_VERSION}.d"
case "$YNH_APP_HELPERS_VERSION" in case "$YNH_HELPERS_VERSION" in
1) 1)
readarray -t HELPERS < <(find "$YNH_APP_HELPERS_DIR" -mindepth 1 -maxdepth 1 -type f) readarray -t HELPERS < <(find "$YNH_HELPERS_DIR" -mindepth 1 -maxdepth 1 -type f)
for helper in "${HELPERS[@]}"; do for helper in "${HELPERS[@]}"; do
[ -r "$helper" ] && source "$helper" [ -r "$helper" ] && source "$helper"
done done
;; ;;
*) *)
echo "Helpers are not available in version '$YNH_APP_HELPERS_VERSION'." >&2 echo "Helpers are not available in version '$YNH_HELPERS_VERSION'." >&2
exit 1 exit 1
esac esac

2
helpers/helpers.v1.d/nodejs
View file

@ -115,7 +115,7 @@ ynh_install_nodejs() {
# Install (or update if YunoHost vendor/ folder updated since last install) n # Install (or update if YunoHost vendor/ folder updated since last install) n
mkdir -p $n_install_dir/bin/ mkdir -p $n_install_dir/bin/
cp "$YNH_APP_HELPERS_DIR/vendor/n/n" $n_install_dir/bin/n cp "$YNH_HELPERS_DIR/vendor/n/n" $n_install_dir/bin/n
# Tweak for n to understand it's installed in $N_PREFIX # Tweak for n to understand it's installed in $N_PREFIX
ynh_replace_string --match_string="^N_PREFIX=\${N_PREFIX-.*}$" --replace_string="N_PREFIX=\${N_PREFIX-$N_PREFIX}" --target_file="$n_install_dir/bin/n" ynh_replace_string --match_string="^N_PREFIX=\${N_PREFIX-.*}$" --replace_string="N_PREFIX=\${N_PREFIX-$N_PREFIX}" --target_file="$n_install_dir/bin/n"

2
helpers/helpers.v1.d/utils
View file

@ -318,7 +318,7 @@ ynh_setup_source() {
mv $src_filename $dest_dir/$src_rename mv $src_filename $dest_dir/$src_rename
fi fi
elif [[ "$src_format" == "docker" ]]; then elif [[ "$src_format" == "docker" ]]; then
"$YNH_APP_HELPERS_DIR/vendor/docker-image-extract/docker-image-extract" -p $src_platform -o $dest_dir $src_url 2>&1 "$YNH_HELPERS_DIR/vendor/docker-image-extract/docker-image-extract" -p $src_platform -o $dest_dir $src_url 2>&1
elif [[ "$src_format" == "zip" ]]; then elif [[ "$src_format" == "zip" ]]; then
# Zip format # Zip format
# Using of a temp directory, because unzip doesn't manage --strip-components # Using of a temp directory, because unzip doesn't manage --strip-components