Browse Source

Restore firmware_nonfree to a choice

master
Kayou 2 years ago
parent
commit
3f20eb42b4
No known key found for this signature in database GPG Key ID: 823A2CBE071D3126
3 changed files with 10 additions and 7 deletions
  1. +1
    -1
      check_process
  2. +3
    -2
      manifest.json
  3. +6
    -4
      scripts/install

+ 1
- 1
check_process View File

@@ -4,7 +4,7 @@
path="/path" (PATH)
wifi_ssid="myNeutralNetwork"
wifi_passphrase="VhegT8oev0jZI" (PASSWORD)
firmware_nonfree=0
firmware_nonfree="no"
; Checks
pkg_linter=1
setup_sub_dir=1


+ 3
- 2
manifest.json View File

@@ -64,12 +64,13 @@
},
{
"name": "firmware_nonfree",
"type": "boolean",
"type": "string",
"ask": {
"en": "Install non-free firmwares - in addition to the free ones - for the wifi dongle (yes/no)",
"fr": "Installer des firmwares non-libres (en plus des libres) pour la clé USB wifi (yes/no)"
},
"default": true
"choice": [ "yes", "no" ],
"default": "no"
}
]
}


+ 6
- 4
scripts/install View File

@@ -68,13 +68,15 @@ ynh_webpath_register $app $domain $path_url
# because armbian-firmware conflicts with the non-free packages ...
if dpkg --list | grep -q armbian-firmware; then
echo "You are running Armbian and non-free firmware are known to conflict with armbian-firwmare. " >&2
firmware_nonfree="no"
firmware_nonfree=0
echo "Variable firmware_non_free has been forced to 'no'" >&2
fi

#=================================================
# STORE SETTINGS FROM MANIFEST
#=================================================
if [ $firmware_nonfree = "no" ]; then
firmware_nonfree=0
elif [ $firmware_nonfree = "yes" ]; then
firmware_nonfree=1
fi

# Check arguments
if [[ -z $wifi_ssid || -z $wifi_passphrase ]]; then


Loading…
Cancel
Save