Переименованы параметры

scripts/cl-access-add

@@ -21,7 +21,7 @@ set -e
 # вывод короткой справки
 # show the short help message
 usage() {
-    echo "Usage: $0 --id ID [--sshkey PKEY] [--header HEADER] --key KEYFILE --device DEVICE --mountpoint MOUNTPOINT
+    echo "Usage: $0 --id ID [--ssh-key PKEY] [--header HEADER] --key KEYFILE --device DEVICE --mount DIR
 
 Version: $CL_ACCESS_VERSION
 
@@ -33,18 +33,18 @@ ${DESCRIPTION}
 # вывод полной справки
 # show the long help message
 long_usage() {
-    echo "Usage: $0 --id ID [--sshkey PKEY] [--header HEADER] --key KEYFILE --device DEVICE --mountpoint MOUNTPOINT
+    echo "Usage: $0 --id ID [--ssh-key PKEY] [--header HEADER] --key KEYFILE --device DEVICE --mount DIR
 
 Version: $CL_ACCESS_VERSION
 
 ${DESCRIPTION}
 
   --id ID                       set access id
-  --sshkey PKEY              public authorized key 
+  -s PKEY, --ssh-key PKEY       public authorized key
-  --header HEADER            separated LUKS header
+  -H HEADER, --header HEADER    separated LUKS header
-  --key KEYFILE              LUKS key file
+  -k KEYFILE, --key KEYFILE     LUKS key file
-  --device DEVICE            LUKS device (/dev or PARTUUID)
+  -d DEVICE, --device DEVICE    LUKS device (/dev or PARTUUID)
-  --mountpoint MOUNTPOINT    mount point
+  -m DIR, --mount DIR           mount point
 "
 }
 
@@ -53,14 +53,14 @@ ${DESCRIPTION}
 rearrange_params() {
     set +e
     TEMP=$(unset POSIXLY_CORRECT; getopt \
-        -o "h" \
+        -o "hs:H:k:d:m:" \
         --long help \
         --long id: \
-        --long sshkey: \
+        --long ssh-key: \
         --long header: \
         --long key: \
         --long device: \
-        --long mountpoint: \
+        --long mount: \
         -- "$@" 2>&1)
     if (( $? != 0 )); then
         echo "$TEMP" | sed 's/getopt: /cl-access-add: /;$d'
@@ -82,27 +82,23 @@ do_args() {
             ID="$2"
             shift
             ;;
-        --sshkey)
+        -s|--ssh-key)
             SSHKEY="$2"
             shift
             ;;
-        --header)
+        -H|--header)
             HEADER="$2"
             shift
             ;;
-        --key)
+        -k|--key)
             KEY="$2"
             shift
             ;;
-        --device)
+        -d|--device)
             DEVICE="$2"
             shift
             ;;
-	--partuuid)
+        -m|---mount)
-            PARTUUID="$2"
-	    shift
-            ;;
-        --mountpoint)
             MP="$2"
             shift
             ;;
@@ -292,7 +288,6 @@ check_device_name $DEVICE
 
 id_not_exists $ID || ask_rewrite_sshkey
 
-
 id_not_exists $ID && create_id $ID
 
 create_record "$ID" "$KEY" "$DEVICE" "$MP" "$HEADER"