Browse Source

firmware_nonfree is now a boolean

keoma 6 years ago
parent
commit
898604a772
4 changed files with 6 additions and 8 deletions
  1. 1 1
      check_process
  2. 3 5
      manifest.json
  3. 1 1
      scripts/install
  4. 1 1
      scripts/remove

+ 1 - 1
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

+ 3 - 5
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"
       }
     ]
   }

+ 1 - 1
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

+ 1 - 1
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