YunoHost-Apps/hotspot_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/hotspot_ynh.git synced 2024-09-03 19:25:53 +02:00
Code Issues Activity Actions

Restore firmware_nonfree to a choice

Browse source
This commit is contained in:
Kayou 2019-03-19 21:33:16 +01:00
parent fcfe018a74
commit 3f20eb42b4
No known key found for this signature in database
GPG key ID: 823A2CBE071D3126
3 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
check_process
View file

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

5
manifest.json
View file

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

10
scripts/install
View file

@ -68,13 +68,15 @@ ynh_webpath_register $app $domain $path_url
# because armbian-firmware conflicts with the non-free packages ... # because armbian-firmware conflicts with the non-free packages ...
if dpkg --list | grep -q armbian-firmware; then 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 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 echo "Variable firmware_non_free has been forced to 'no'" >&2
fi fi
#================================================= if [ $firmware_nonfree = "no" ]; then
# STORE SETTINGS FROM MANIFEST firmware_nonfree=0
#================================================= elif [ $firmware_nonfree = "yes" ]; then
firmware_nonfree=1
fi
# Check arguments # Check arguments
if [[ -z $wifi_ssid || -z $wifi_passphrase ]]; then if [[ -z $wifi_ssid || -z $wifi_passphrase ]]; then