From c0264a8e007b4d0e97bd3785e162049595a392a3 Mon Sep 17 00:00:00 2001
From: Arzhan Kinzhalin <arzhan.i.kinzhalin@intel.com>
Date: Sun, 9 Jul 2017 05:18:39 +0000
Subject: [PATCH] Clean up.

---
 clrtrust | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/clrtrust b/clrtrust
index 26c044a..4b665f0 100755
--- a/clrtrust
+++ b/clrtrust
@@ -167,7 +167,6 @@ EOF
 function cmd_add {
     local _cert
     local _basename
-    local _opt_force
     local _out
     local _finger
     while [ $# -gt 0 ]; do
@@ -176,10 +175,6 @@ function cmd_add {
                 print_add_help
                 return 0
                 ;;
-            -f|--force)
-                _opt_force=1
-                shift
-                ;;
             *)
                 _cert=$1
                 shift
@@ -300,7 +295,8 @@ Usage: ${BASENAME} remove [-f|--force] [filename|id]...
     either by a file containing PEM-encoded X.509 certificate or an id as
     obtained from the list command.
 
-    -f
+    -f | --force        Forces removal of certificates
+    -h | --help         Prints this help message
 EOF
 }
 
@@ -311,6 +307,7 @@ function cmd_remove {
     local _out_pipe
     local _invld_files
     local _certs
+    local _opt_force
     while [ $# -gt 0 ]; do
         case $1 in
             -h|--help)
@@ -319,6 +316,7 @@ function cmd_remove {
                 ;;                    
             -f|--force)
                 # TODO: implement forcing
+                _opt_force=1
                 true
                 ;;
             *)