[lxc-devel] [PATCH] Remove the need for -n/--name from lxc-create, lxc-destroy and lxc-netstat

[Michael Holzt]

This patch removes the need to specify -n or --name in front of the
container name from the lxc-create, lxc-destroy and lxc-netstat commands.

Signed-off-by: Michael Holzt <lxc at my.fqdn.org>
---
 src/lxc/lxc-create.in  |    6 +++++-
 src/lxc/lxc-destroy.in |    6 +++++-
 src/lxc/lxc-netstat.in |    6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/lxc/lxc-create.in b/src/lxc/lxc-create.in
index b1b986a..4238478 100644
--- a/src/lxc/lxc-create.in
+++ b/src/lxc/lxc-create.in
@@ -26,7 +26,7 @@
 #
 
 usage() {
-    echo "usage: $0 -n <name> [-f configuration] [-t template]"
+    echo "usage: $0 [-n] <name> [-f configuration] [-t template]"
 }
 
 if [ "$(id -u)" != "0" ]; then
@@ -85,6 +85,10 @@ if [ ! -r $lxc_path ]; then
 fi
 
 if [ -z "$lxc_name" ]; then
+    lxc_name=$1
+fi
+
+if [ -z "$lxc_name" ]; then
     echo "no container name specified"
     usage $0
     exit 1
diff --git a/src/lxc/lxc-destroy.in b/src/lxc/lxc-destroy.in
index 565d89d..0a738e0 100644
--- a/src/lxc/lxc-destroy.in
+++ b/src/lxc/lxc-destroy.in
@@ -26,7 +26,7 @@
 #
 
 usage() {
-    echo "usage: $0 -n <name>"
+    echo "usage: $0 [-n] <name>"
 }
 
 if [ "$(id -u)" != "0" ]; then
@@ -65,6 +65,10 @@ while true; do
 done
 
 if [ -z "$lxc_name" ]; then
+    lxc_name=$1
+fi
+    
+if [ -z "$lxc_name" ]; then
     echo "no container name specified"
     usage $0
     exit 1
diff --git a/src/lxc/lxc-netstat.in b/src/lxc/lxc-netstat.in
index 1fecc5e..e5b187d 100644
--- a/src/lxc/lxc-netstat.in
+++ b/src/lxc/lxc-netstat.in
@@ -4,7 +4,7 @@
 exec=""
 
 if [ $# -eq  0 ]; then
-    echo "usage: $0 -n <name>"
+    echo "usage: $0 [-n] <name>"
     exit 1
 fi
 
@@ -14,6 +14,8 @@ for i in $*; do
             name=$2; shift 2;;
         --exec)
             exec="exec"; shift;;
+        *)
+            name=$i; shift;;
     esac
 done
 
@@ -22,7 +24,7 @@ if [ -z "$exec" ]; then
 fi
 
 if [ -z "$name" ]; then
-    echo "usage: $0 -n <name>"
+    echo "usage: $0 [-n] <name>"
     exit 1
 fi
 
-- 
1.6.5