fix: variable name

This commit is contained in:
Peter Njeim 2022-09-04 18:58:06 -03:00
parent 548bb674bd
commit 8e7c70ba89

View File

@ -85,9 +85,9 @@ jobs:
RELEASE_TYPE="${opts[RELEASE_TYPE,${{ inputs.release_type }}]}" RELEASE_TYPE="${opts[RELEASE_TYPE,${{ inputs.release_type }}]}"
if [ "${{inputs.magisk_ver }}" != "None" ]; then if [[ "${{ inputs.magisk_ver }}" != "None" ]]; then
ROOT_SOL="magisk" ROOT_SOL="magisk"
if [ "${{ inputs.magisk_ver }}" != "Custom" ]; then if [[ "${{ inputs.magisk_ver }}" != "Custom" ]]; then
MAGISK_VER="${opts[MAGISK_VER,${{ inputs.magisk_ver }}]}" MAGISK_VER="${opts[MAGISK_VER,${{ inputs.magisk_ver }}]}"
else else
echo "${{ inputs.magisk_url }}" > "$DOWNLOAD_DIR"/"$DOWNLOAD_CONF_NAME" echo "${{ inputs.magisk_url }}" > "$DOWNLOAD_DIR"/"$DOWNLOAD_CONF_NAME"
@ -104,23 +104,23 @@ jobs:
MAGISK_VER="${opts[MAGISK_VER,Stable]}" MAGISK_VER="${opts[MAGISK_VER,Stable]}"
fi fi
if [ "$ARCH" == "x86_64" ]; then if [[ "${{ inputs.arch }}" == "x86_64" ]]; then
GAPPS_VAR="${opts[GAPPS_VAR,${{ inputs.gapps_var }}]}" GAPPS_VAR="${opts[GAPPS_VAR,${{ inputs.gapps_var }}]}"
else else
# TODO: keep it 11.0 since official opengapps does not support 12+ yet # TODO: keep it 11.0 since official opengapps does not support 12+ yet
# As soon as opengapps is available for 12+, we need to get the sdk/release from build.prop and download the corresponding version # As soon as opengapps is available for 12+, we need to get the sdk/release from build.prop and download the corresponding version
if [ "${{ inputs.gapps_var }}" == "Full" ]; then if [[ "${{ inputs.gapps_var }}" == "Full" ]]; then
GAPPS_VAR="${opts[GAPPS_VAR,Pico]}" GAPPS_VAR="${opts[GAPPS_VAR,Pico]}"
else else
GAPPS_VAR="${opts[GAPPS_VAR,${{ inputs.gapps_var }}]}" GAPPS_VAR="${opts[GAPPS_VAR,${{ inputs.gapps_var }}]}"
fi fi
fi fi
if [ "${{inputs.gapps_var }}" != "None" ]; then if [[ "${{ inputs.gapps_var }}" != "None" ]]; then
if [ "${{ inputs.gapps_var }}" != "Custom (MindTheGapps)" ]; then if [[ "${{ inputs.gapps_var }}" != "Custom (MindTheGapps)" ]]; then
GAPPS_BRAND="OpenGApps" GAPPS_BRAND="OpenGApps"
if [ "${{ inputs.gapps_var }}" == "Custom (OpenGApps)" ]; then if [[ "${{ inputs.gapps_var }}" == "Custom (OpenGApps)" ]]; then
if [ -z "${${{ inputs.gapps_url }}+x}" ]; then if [[ -z "${${{ inputs.gapps_url }}+x}" ]]; then
GAPPS_VARIANT_MAP=( GAPPS_VARIANT_MAP=(
"super" "super"
"stock" "stock"
@ -138,7 +138,7 @@ jobs:
GAPPS_VAR=${GAPPS_VAR##*-} GAPPS_VAR=${GAPPS_VAR##*-}
list_count=${#GAPPS_VARIANT_MAP[@]} list_count=${#GAPPS_VARIANT_MAP[@]}
for i in "${GAPPS_VARIANT_MAP[@]}"; do for i in "${GAPPS_VARIANT_MAP[@]}"; do
if [ "$GAPPS_VAR" == "$i" ]; then if [[ "$GAPPS_VAR" == "$i" ]]; then
echo "INFO: GApps Variant: $GAPPS_VAR" echo "INFO: GApps Variant: $GAPPS_VAR"
valid_gapps_var="true" valid_gapps_var="true"
break break
@ -182,10 +182,10 @@ jobs:
REMOVE_AMAZON="${opts[REMOVE_AMAZON,${{ inputs.remove_amazon }}]}" REMOVE_AMAZON="${opts[REMOVE_AMAZON,${{ inputs.remove_amazon }}]}"
if [ "${{ inputs.gapps_var }}" == "Custom (OpenGApps)" ]; then if [[ "${{ inputs.gapps_var }}" == "Custom (OpenGApps)" ]]; then
echo "Generate Download Links" echo "Generate Download Links"
python3 generateWSALinks.py "$ARCH" "$RELEASE_TYPE" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" python3 generateWSALinks.py "$ARCH" "$RELEASE_TYPE" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME"
if [ "${{ inputs.magisk_ver }}" != "Custom" ]; then if [[ "${{ inputs.magisk_ver }}" != "Custom" ]]; then
python3 generateMagiskLink.py "$MAGISK_VER" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME" python3 generateMagiskLink.py "$MAGISK_VER" "$DOWNLOAD_DIR" "$DOWNLOAD_CONF_NAME"
fi fi