Parcourir la source

Revert "firmware_nonfree is now a boolean"

This reverts commit 898604a772b4143df432f6943cc37c00daa4767f.
keoma il y a 6 ans
Parent
commit
c5c3b33025
4 fichiers modifiés avec 8 ajouts et 6 suppressions
  1. 1 1
      check_process
  2. 5 3
      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=0
+		firmware_nonfree="no"
 	; Checks
 		pkg_linter=1
 		setup_sub_dir=1

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

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

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