From c5c3b33025c8ebf15bbd3ff82437f59918c8f7ac Mon Sep 17 00:00:00 2001
From: keoma <keoma.brun@inria.fr>
Date: Sun, 10 Feb 2019 01:13:04 +0100
Subject: [PATCH] Revert "firmware_nonfree is now a boolean"

This reverts commit 898604a772b4143df432f6943cc37c00daa4767f.
---
 check_process   | 2 +-
 manifest.json   | 8 +++++---
 scripts/install | 2 +-
 scripts/remove  | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/check_process b/check_process
index 672251a..4645a79 100644
--- a/check_process
+++ b/check_process
@@ -5,7 +5,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
diff --git a/manifest.json b/manifest.json
index d83c03e..5061fda 100644
--- a/manifest.json
+++ b/manifest.json
@@ -65,11 +65,13 @@
       {
         "name": "firmware_nonfree",
         "type": "boolean",
+        "choice": ["yes", "no"],
         "ask": {
-            "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"
+            "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": "false"
+        "example": "yes",
+        "default": "yes"
       }
     ]
   }
diff --git a/scripts/install b/scripts/install
index 69b0455..e1f62d5 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 -eq 1 ]]; then
+if [[ $firmware_nonfree == yes ]]; 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 12bbe6a..686375f 100644
--- a/scripts/remove
+++ b/scripts/remove
@@ -60,7 +60,7 @@ do
 done
 
 # Remove packages
-if [[ $firmware_nonfree -eq 1 ]]; then
+if [[ $firmware_nonfree == yes ]]; then
   packages=$nonfree_packages
 else
   packages=$free_packages