From 898604a772b4143df432f6943cc37c00daa4767f Mon Sep 17 00:00:00 2001 From: keoma Date: Sat, 9 Feb 2019 15:08:00 +0100 Subject: [PATCH] firmware_nonfree is now a boolean --- check_process | 2 +- manifest.json | 8 +++----- scripts/install | 2 +- scripts/remove | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/check_process b/check_process index 4645a79..672251a 100644 --- a/check_process +++ b/check_process @@ -5,7 +5,7 @@ path="/path" (PATH) wifi_ssid="myNeutralNetwork" wifi_passphrase="VhegT8oev0jZI" (PASSWORD) - firmware_nonfree="no" + firmware_nonfree=0 ; Checks pkg_linter=1 setup_sub_dir=1 diff --git a/manifest.json b/manifest.json index 5061fda..d83c03e 100644 --- a/manifest.json +++ b/manifest.json @@ -65,13 +65,11 @@ { "name": "firmware_nonfree", "type": "boolean", - "choice": ["yes", "no"], "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)" + "en": "Install non-free firmwares - in addition to the free ones - for the wifi dongle", + "fr": "Installer des firmwares non-libres (en plus des libres) pour la clé USB wifi" }, - "example": "yes", - "default": "yes" + "default": "false" } ] } diff --git a/scripts/install b/scripts/install index e1f62d5..69b0455 100644 --- a/scripts/install +++ b/scripts/install @@ -116,7 +116,7 @@ export DEBIAN_FRONTEND=noninteractive # Packaged USB Wireless Device firmwares # Based on https://wiki.debian.org/WiFi#USB_Devices -if [[ $firmware_nonfree == yes ]]; then +if [[ $firmware_nonfree -eq 1 ]]; then # check if non-free is set on sources.list if ! grep -q non-free /etc/apt/sources.list ; then sed '/debian/{s/main/& non-free/}' -i /etc/apt/sources.list diff --git a/scripts/remove b/scripts/remove index 686375f..12bbe6a 100644 --- a/scripts/remove +++ b/scripts/remove @@ -60,7 +60,7 @@ do done # Remove packages -if [[ $firmware_nonfree == yes ]]; then +if [[ $firmware_nonfree -eq 1 ]]; then packages=$nonfree_packages else packages=$free_packages