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

Revert part of the changes in previous commit because we still need to be able to test upgrades from packaging v1

Browse source
This commit is contained in:
Alexandre Aubin 2024-08-22 13:40:10 +02:00
parent b3fe86ea96
commit cef5c96090
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
lib/tests.sh
View file

@ -132,15 +132,26 @@ _INSTALL_APP () {
# Note : we do this at this stage and not during the parsing of check_process # Note : we do this at this stage and not during the parsing of check_process
# because this also applies to upgrades ... ie older version may have different args and default values # because this also applies to upgrades ... ie older version may have different args and default values
# Fetch and loop over all manifest arg # Fetch and loop over all manifest arg ... NB : we need to keep this as long as there are "upgrade from packaging v1" tests
local manifest_args="$(grep -oE '^\s*\[install\.\w+]' $package_path/manifest.toml | tr -d '[]' | awk -F. '{print $2}')" if [[ -e $package_path/manifest.json ]]
then
local manifest_args="$(jq -r '.arguments.install[].name' $package_path/manifest.json)"
else
local manifest_args="$(grep -oE '^\s*\[install\.\w+]' $package_path/manifest.toml | tr -d '[]' | awk -F. '{print $2}')"
fi
for ARG in $manifest_args for ARG in $manifest_args
do do
# If the argument is not yet in install args, add its default value # If the argument is not yet in install args, add its default value
if ! echo "$install_args" | grep -q -E "\<$ARG=" if ! echo "$install_args" | grep -q -E "\<$ARG="
then then
local default_value=$(python3 -c "import toml, sys; t = toml.loads(sys.stdin.read()); d = t['install']['$ARG'].get('default'); assert d is not None, 'Missing default value'; print(d)" < $package_path/manifest.toml) # NB : we need to keep this as long as there are "upgrade from packaging v1" tests
if [[ -e $package_path/manifest.json ]]
then
local default_value=$(jq -e -r --arg ARG $ARG '.arguments.install[] | select(.name==$ARG) | .default' $package_path/manifest.json)
else
local default_value=$(python3 -c "import toml, sys; t = toml.loads(sys.stdin.read()); d = t['install']['$ARG'].get('default'); assert d is not None, 'Missing default value'; print(d)" < $package_path/manifest.toml)
fi
[[ $? -eq 0 ]] || { log_error "Missing install arg $ARG ?"; return 1; } [[ $? -eq 0 ]] || { log_error "Missing install arg $ARG ?"; return 1; }
[[ ${install_args: -1} == '&' ]] || install_args+="&" [[ ${install_args: -1} == '&' ]] || install_args+="&"
install_args+="$ARG=$default_value" install_args+="$ARG=$default_value"