Changeset 914

Timestamp:

Mar 21, 2016, 12:47:19 PM (3 years ago)

Author:

kbut

Message:

wip

Location:

lliurex-maker/trunk/fuentes/new

Files:

• etc/bash_completion.d/lliurex-maker (modified) (2 diffs)
• usr/bin/lliurex-maker (modified) (3 diffs)

lliurex-maker/trunk/fuentes/new/etc/bash_completion.d/lliurex-maker

@@ -10 +10 @@
     #  The basic options we'll complete.
     #
-    opts="build clean"
+    opts="build clean -a --arch= -m --mirror= -i --interactive"
 
 
@@ -18 +18 @@
     case "${prev}" in
         build)
-            local running=$( ls /usr/share/lliurex-maker/configuracions/ | grep -v "common" | tr "\n" " ")
+            local running=$( ls /usr/share/lliurex-maker/configuration/ | grep -v "common" | tr "\n" " ")
             COMPREPLY=( $(compgen -W "${running}" -- ${cur}) )
             return 0

lliurex-maker/trunk/fuentes/new/usr/bin/lliurex-maker

@@ -10 +10 @@
 usage(){
         echo "usage"
-        echo -e "\t $(basename $0) build [ -f FLAVOUR|--flavour=FLAVOUR ] EXTRAOPTIONS"
+        echo -e "\t $(basename $0) build FLAVOUR EXTRAOPTIONS"
         echo -e "\t $(basename $0) clean"
         echo -e ""
@@ -45 +45 @@
         key="$1"
         case $key in 
-                build|clean)
-                        ACTION="$key"
+                build)
+                        ACTION="build"
+                        FLAVOUR="$2"
+                        shift
+                ;;
+                clean)
+                        ACTION="clean"
                 ;;
                 -a)
@@ -54 +59 @@
                 --arch)
                         ARCH=${key##--arch=}
-                ;;
-                -f)
-                        FLAVOUR="$2"
-                        shift
-                ;;
-                --flavour)
-                        FLAVOUR=${key##--flavour=}
                 ;;
                 -m)