k2hr3-api 1.0.38 → 1.0.40

package/routes/service.js

@@ -261,12 +261,10 @@ router.post('/', function(req, res, next)								// eslint-disable-line no-unuse
 		!apiutil.isSafeEntity(req.baseUrl)	||
 		!apiutil.isSafeEntity(req.body)		)
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'POST body does not exist'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'POST body does not exist'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400, result);						// 400: Bad Request
@@ -309,12 +307,10 @@ router.post('/', function(req, res, next)								// eslint-disable-line no-unuse
 	var	cnt;
 	if(is_create){
 		if(!apiutil.isSafeString(req.body.name)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'service:name field is wrong : ' + JSON.stringify(req.body.name)
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'service:name field is wrong : ' + JSON.stringify(req.body.name)
+			};
 
 			r3logger.elog(result.message);
 			resutil.errResponse(req, res, 400, result);					// 400: Bad Request
@@ -356,12 +352,10 @@ router.post('/', function(req, res, next)								// eslint-disable-line no-unuse
 			verify = req.body.verify;
 		}
 		if(null === tenant && null === verify){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'both tenant and verify are not specified.'
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'both tenant and verify are not specified.'
+			};
 
 			r3logger.elog(result.message);
 			resutil.errResponse(req, res, 400, result);					// 400: Bad Request
@@ -374,12 +368,10 @@ router.post('/', function(req, res, next)								// eslint-disable-line no-unuse
 	//------------------------------
 	var	error = rawUpdateService(token_info.tenant, name, verify, tenant, is_clear, is_create);
 	if(null !== error){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	error.message
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	error.message
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 403, result);						// 403: Forbidden(is this status OK?)
@@ -430,12 +422,10 @@ router.put('/', function(req, res, next)								// eslint-disable-line no-unused
 		!apiutil.isSafeEntity(req.baseUrl)	||
 		!apiutil.isSafeEntity(req.query)	)
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'PUT argument does not have any data'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'PUT argument does not have any data'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400, result);						// 400: Bad Request
@@ -477,12 +467,10 @@ router.put('/', function(req, res, next)								// eslint-disable-line no-unused
 	var	is_clear	= false;
 	if(is_create){
 		if(!apiutil.isSafeString(req.query.name)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'name argument is wrong : ' + JSON.stringify(req.query.name)
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'name argument is wrong : ' + JSON.stringify(req.query.name)
+			};
 
 			r3logger.elog(result.message);
 			resutil.errResponse(req, res, 400, result);					// 400: Bad Request
@@ -534,12 +522,10 @@ router.put('/', function(req, res, next)								// eslint-disable-line no-unused
 			}
 		}
 		if(null === tenant && null === verify){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'both tenant and verify are not specified.'
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'both tenant and verify are not specified.'
+			};
 
 			r3logger.elog(result.message);
 			resutil.errResponse(req, res, 400, result);					// 400: Bad Request
@@ -552,12 +538,10 @@ router.put('/', function(req, res, next)								// eslint-disable-line no-unused
 	//------------------------------
 	var	error = rawUpdateService(token_info.tenant, name, verify, tenant, is_clear, is_create);
 	if(null !== error){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	error.message
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	error.message
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 403, result);						// 403: Forbidden(is this status OK?)
@@ -599,12 +583,10 @@ router.get('/', function(req, res, next)
 	if(	!apiutil.isSafeEntity(req)			||
 		!apiutil.isSafeEntity(req.baseUrl)	)
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'GET request or url is wrong'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'GET request or url is wrong'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400, result);						// 400: Bad Request
@@ -630,12 +612,10 @@ router.get('/', function(req, res, next)
 	var	requestptn	= new RegExp('^/v1/service/(.*)');					// regex = /^\/v1\/service\/(.*)/
 	var	reqmatchs	= decodeURI(req.baseUrl).match(requestptn);
 	if(apiutil.isEmptyArray(reqmatchs) || reqmatchs.length < 2 || '' === apiutil.getSafeString(reqmatchs[1])){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'GET request url does not have service name'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'GET request url does not have service name'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400, result);						// 400: Bad Request
@@ -649,12 +629,10 @@ router.get('/', function(req, res, next)
 	result = k2hr3.getService(token_info.tenant, servicename);
 	if(!apiutil.isSafeEntity(result) || !apiutil.isSafeEntity(result.result) || false === result.result){
 		if(!apiutil.isSafeEntity(result)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'Could not get service data from getService'
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'Could not get service data from getService'
+			};
 		}else{
 			if(!apiutil.isSafeEntity(result.result)){
 				result.result	= false;
@@ -709,12 +687,10 @@ router.head('/', function(req, res, next)
 	if(	!apiutil.isSafeEntity(req)			||
 		!apiutil.isSafeEntity(req.baseUrl)	)
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'HEAD request or url or query is wrong'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'HEAD request or url or query is wrong'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400, result);						// 400: Bad Request
@@ -740,12 +716,10 @@ router.head('/', function(req, res, next)
 	var	requestptn	= new RegExp('^/v1/service/(.*)');					// regex = /^\/v1\/service\/(.*)/
 	var	reqmatchs	= decodeURI(req.baseUrl).match(requestptn);
 	if(apiutil.isEmptyArray(reqmatchs) || reqmatchs.length < 2 || '' === apiutil.getSafeString(reqmatchs[1])){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'GET request url does not have service name'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'GET request url does not have service name'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400, result);						// 400: Bad Request
@@ -768,12 +742,10 @@ router.head('/', function(req, res, next)
 	result = k2hr3.getService(token_info.tenant, servicename);
 	if(!apiutil.isSafeEntity(result) || !apiutil.isSafeEntity(result.result) || false === result.result){
 		if(!apiutil.isSafeEntity(result)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'Could not get service data from getService'
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'Could not get service data from getService'
+			};
 		}else{
 			if(!apiutil.isSafeEntity(result.result)){
 				result.result	= false;
@@ -789,12 +761,10 @@ router.head('/', function(req, res, next)
 	if(null !== tenantyrn){
 		// tenant check
 		if(!apiutil.isSafeEntity(result.service) || !apiutil.isArray(result.service.tenant) || !apiutil.findStringInArray(result.service.tenant, tenantyrn)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'Deny tenant(' + req.query.tenant.toLowerCase() + ') for service(' + servicename + ')'
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'Deny tenant(' + req.query.tenant.toLowerCase() + ') for service(' + servicename + ')'
+			};
 
 			r3logger.elog(result.message);
 			resutil.errResponse(req, res, 403);							// 403: Forbidden(is this status OK?)
@@ -830,12 +800,10 @@ router.delete('/', function(req, res, next)								// eslint-disable-line no-unu
 	if(	!apiutil.isSafeEntity(req)			||
 		!apiutil.isSafeEntity(req.baseUrl)	)
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'DELETE request or url or query is wrong'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'DELETE request or url or query is wrong'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400);								// 400: Bad Request
@@ -861,12 +829,10 @@ router.delete('/', function(req, res, next)								// eslint-disable-line no-unu
 	var	requestptn	= new RegExp('^/v1/service/(.*)');					// regex = /^\/v1\/service\/(.*)/
 	var	reqmatchs	= decodeURI(req.baseUrl).match(requestptn);
 	if(apiutil.isEmptyArray(reqmatchs) || reqmatchs.length < 2 || '' === apiutil.getSafeString(reqmatchs[1])){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'DELETE request url does not have service name'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'DELETE request url does not have service name'
+		};
 
 		r3logger.elog(result.message);
 		resutil.errResponse(req, res, 400, result);						// 400: Bad Request
@@ -894,12 +860,10 @@ router.delete('/', function(req, res, next)								// eslint-disable-line no-unu
 	}
 	if(!apiutil.isSafeEntity(result) || !apiutil.isSafeEntity(result.result) || false === result.result){
 		if(!apiutil.isSafeEntity(result)){
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'Could not remove service data from ' + (null === tenantname ? 'removeService' : 'denyTenantFromService')
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'Could not remove service data from ' + (null === tenantname ? 'removeService' : 'denyTenantFromService')
+			};
 		}else{
 			if(!apiutil.isSafeEntity(result.result)){
 				result.result	= false;

package/routes/userTokens.js

@@ -381,7 +381,7 @@ router.put('/', function(req, res, next)						// eslint-disable-line no-unused-v
 // Which element has name and display member, but display is as same as name.
 // It is not real display name, because we take a cost getting it from APIs.
 //
-router.get('/', function(req, res, next)						// eslint-disable-line no-unused-vars
+router.get('/', function(req, res, next)
 {
 	r3logger.dlog('CALL:', req.method, req.url);
 	if('HEAD' === req.method){

package/routes/userdata.js

@@ -62,12 +62,10 @@ router.get('/', function(req, res, next)
 		!apiutil.isSafeEntity(req.baseUrl)	||
 		!apiutil.isSafeEntity(req.headers)	)							// Must User-Agent in header
 	{
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'GET request or url is wrong'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'GET request or url is wrong'
+		};
 
 		r3logger.elog(result.message);
 		res.type('application/json; charset=utf-8');
@@ -83,12 +81,10 @@ router.get('/', function(req, res, next)
 		// 'User-Agent' Must have 'Cloud-Init'
 		r3logger.elog('GET request does not have User-Agent header');
 
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'GET request does not have User-Agent header'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'GET request does not have User-Agent header'
+		};
 
 		r3logger.elog(result.message);
 		res.type('application/json; charset=utf-8');
@@ -100,12 +96,10 @@ router.get('/', function(req, res, next)
 			// 'User-Agent' Must have 'Cloud-Init'
 			r3logger.elog('GET request User-Agent does not have Cloud-Init');
 
-			/* eslint-disable indent, no-mixed-spaces-and-tabs */
 			result = {
-						result: 	false,
-						message:	'GET request is not allowed from your client'
-					 };
-			/* eslint-enable indent, no-mixed-spaces-and-tabs */
+				result: 	false,
+				message:	'GET request is not allowed from your client'
+			};
 
 			r3logger.elog(result.message);
 			res.type('application/json; charset=utf-8');
@@ -157,12 +151,10 @@ router.get('/', function(req, res, next)
 	var	requestptn	= new RegExp('^/v1/userdata/(.*)');				// regex = /^\/v1\/userdata\/(.*)/
 	var	reqmatchs	= decodeURI(req.baseUrl).match(requestptn);
 	if(apiutil.isEmptyArray(reqmatchs) || reqmatchs.length < 2 || '' === apiutil.getSafeString(reqmatchs[1])){
-		/* eslint-disable indent, no-mixed-spaces-and-tabs */
 		result = {
-					result: 	false,
-					message:	'GET request url does not have userdata path parameter'
-				 };
-		/* eslint-enable indent, no-mixed-spaces-and-tabs */
+			result: 	false,
+			message:	'GET request url does not have userdata path parameter'
+		};
 
 		r3logger.elog(result.message);
 		res.type('application/json; charset=utf-8');

package/routes/version.js

@@ -50,31 +50,47 @@ router.get('/v1', function(req, res, next)						// eslint-disable-line no-unused
 
 	res.type('application/json; charset=utf-8');
 
-	/* eslint-disable indent, no-mixed-spaces-and-tabs */
 	var result = {
-		'version':		{	'/':										['GET'],
-							'/v1':										['GET']},
-		'user token':	{	'/v1/user/tokens':							['HEAD', 'GET', 'POST']},
-		'host':			{	'/v1/host':									['GET', 'PUT', 'POST', 'DELETE'],
-							'/v1/host/{port}':							['PUT', 'POST', 'DELETE'],
-							'/v1/host/FQDN':							['DELETE'],
-							'/v1/host/FQDN:{port}':						['DELETE'],
-							'/v1/host/IP':								['DELETE'],
-							'/v1/host/IP:{port}':						['DELETE']},
-		'service':		{	'/v1/service':								['PUT', 'POST'],
-							'/v1/service/{service}':					['GET', 'HEAD', 'PUT', 'POST', 'DELETE']},
-		'role':			{	'/v1/role':									['PUT', 'POST'],
-							'/v1/role/{role}':							['HEAD', 'GET', 'PUT', 'POST', 'DELETE'],
-							'/v1/role/token/{role}':					['GET']},
-		'resource':		{	'/v1/resource':								['PUT', 'POST'],
-							'/v1/resource/{resource}':					['HEAD', 'GET', 'DELETE']},
-		'policy':		{	'/v1/policy':								['PUT', 'POST'],
-							'/v1/policy/{policy}':						['HEAD', 'GET', 'DELETE']},
-		'list':			{	'/v1/list':									['HEAD', 'GET'],
-							'/v1/list/{role, resource, policy}/{path}':	['HEAD', 'GET']},
-		'acr':			{	'/v1/acr/{service}':						['GET', 'PUT', 'POST', 'DELETE']}
+		'version': {
+			'/':										['GET'],
+			'/v1':										['GET']
+		},
+		'user token': {
+			'/v1/user/tokens':							['HEAD', 'GET', 'POST']
+		},
+		'host': {
+			'/v1/host':									['GET', 'PUT', 'POST', 'DELETE'],
+			'/v1/host/{port}':							['PUT', 'POST', 'DELETE'],
+			'/v1/host/FQDN':							['DELETE'],
+			'/v1/host/FQDN:{port}':						['DELETE'],
+			'/v1/host/IP':								['DELETE'],
+			'/v1/host/IP:{port}':						['DELETE']
+		},
+		'service': {
+			'/v1/service':								['PUT', 'POST'],
+			'/v1/service/{service}':					['GET', 'HEAD', 'PUT', 'POST', 'DELETE']
+		},
+		'role': {
+			'/v1/role':									['PUT', 'POST'],
+			'/v1/role/{role}':							['HEAD', 'GET', 'PUT', 'POST', 'DELETE'],
+			'/v1/role/token/{role}':					['GET']
+		},
+		'resource': {
+			'/v1/resource':								['PUT', 'POST'],
+			'/v1/resource/{resource}':					['HEAD', 'GET', 'DELETE']
+		},
+		'policy': {
+			'/v1/policy':								['PUT', 'POST'],
+			'/v1/policy/{policy}':						['HEAD', 'GET', 'DELETE']
+		},
+		'list': {
+			'/v1/list':									['HEAD', 'GET'],
+			'/v1/list/{role, resource, policy}/{path}':	['HEAD', 'GET']
+		},
+		'acr': {
+			'/v1/acr/{service}':						['GET', 'PUT', 'POST', 'DELETE']
+		}
 	};
-	/* eslint-enable indent, no-mixed-spaces-and-tabs */
 
 	res.status(200);										// 200: OK
 	res.send(JSON.stringify(result));

package/tests/auto_control_subprocess.sh

@@ -64,25 +64,25 @@ while [ $# -ne 0 ]; do
 	if [ -z "$1" ]; then
 		break
 
-	elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--help" ] || [ "$1" = "--HELP" ]; then
+	elif echo "$1" | grep -q -i -e "^-h$" -e "^--help$"; then
 		PrintUsage "${PRGNAME}"
 		exit 0
 
-	elif [ "$1" = "-str" ] || [ "$1" = "-STR" ] || [ "$1" = "--start" ] || [ "$1" = "--START" ]; then
+	elif echo "$1" | grep -q -i -e "^-str$" -e "^--start$"; then
 		if [ -n "${EXEC_MODE}" ]; then
 			echo "[ERROR] Already run mode(--start(-str) or --stop(-stp) option) is specified."
 			exit 1
 		fi
 		EXEC_MODE="start"
 
-	elif [ "$1" = "-stp" ] || [ "$1" = "-STP" ] || [ "$1" = "--stop" ] || [ "$1" = "--STOP" ]; then
+	elif echo "$1" | grep -q -i -e "^-stp$" -e "^--stop$"; then
 		if [ -n "${EXEC_MODE}" ]; then
 			echo "[ERROR] Already run mode(--start(-str) or --stop(-stp) option) is specified."
 			exit 1
 		fi
 		EXEC_MODE="stop"
 
-	elif [ "$1" = "-k" ] || [ "$1" = "-K" ] || [ "$1" = "--key" ] || [ "$1" = "--KEY" ]; then
+	elif echo "$1" | grep -q -i -e "^-k$" -e "^--key$"; then
 		if [ -n "${PID_FILENAME_EXT_PART}" ]; then
 			echo "[ERROR] Already --key(-k) option is specified."
 			exit 1
@@ -94,7 +94,7 @@ while [ $# -ne 0 ]; do
 		fi
 		PID_FILENAME_EXT_PART="_$1"
 
-	elif [ "$1" = "-i" ] || [ "$1" = "-I" ] || [ "$1" = "-int" ] || [ "$1" = "-INT" ] || [ "$1" = "--interval" ] || [ "$1" = "--INTERVAL" ]; then
+	elif echo "$1" | grep -q -i -e "^-i$" -e "^-int$" -e "^--interval$"; then
 		if [ "${RUN_INTERVAL}" -ne 0 ]; then
 			echo "[ERROR] Already --interval(-i) option is specified."
 			exit 1
@@ -174,7 +174,7 @@ if [ "${EXEC_MODE}" = "start" ]; then
 	fi
 
 	# shellcheck disable=SC2009
-	if ! ps -ax | grep -v grep | grep -v defunct | grep -q "${CHILD_PROCESS_PID}"; then
+	if ! ( ps -o pid,stat ax 2>/dev/null | grep -v 'PID' | awk '$2~/^[^Z]/ { print $1 }' | grep -q "^${CHILD_PROCESS_PID}$" || exit 1 && exit 0 ); then
 		echo "[ERROR] Could not start child process : ${CHILD_PROCESS_CMD}"
 		exit 1
 	fi
@@ -191,7 +191,7 @@ else
 		CHILD_PROCESS_PID="$(tr -d '\n' < "${CHILD_PROCESS_PIDFILE}")"
 
 		# shellcheck disable=SC2009
-		if ! ps -ax | grep -v grep | grep -v defunct | grep -q "${CHILD_PROCESS_PID}"; then
+		if ( ps -o pid,stat ax 2>/dev/null | grep -v 'PID' | awk '$2~/^[^Z]/ { print $1 }' | grep -q "^${CHILD_PROCESS_PID}$" || exit 1 && exit 0 ); then
 			#
 			# Try stop
 			#
@@ -203,7 +203,7 @@ else
 			fi
 
 			# shellcheck disable=SC2009
-			if ! ps -ax | grep -v grep | grep -v defunct | grep -q "${CHILD_PROCESS_PID}"; then
+			if ( ps -o pid,stat ax 2>/dev/null | grep -v 'PID' | awk '$2~/^[^Z]/ { print $1 }' | grep -q "^${CHILD_PROCESS_PID}$" || exit 1 && exit 0 ); then
 				#
 				# Retry stop
 				#
@@ -215,7 +215,7 @@ else
 				fi
 
 				# shellcheck disable=SC2009
-				if ! ps -ax | grep -v grep | grep -v defunct | grep -q "${CHILD_PROCESS_PID}"; then
+				if ( ps -o pid,stat ax 2>/dev/null | grep -v 'PID' | awk '$2~/^[^Z]/ { print $1 }' | grep -q "^${CHILD_PROCESS_PID}$" || exit 1 && exit 0 ); then
 					echo "[ERROR] Could not stop process : ${CHILD_PROCESS_NAME}"
 					exit 1
 				fi

package/tests/auto_init_config_json.sh

@@ -63,18 +63,18 @@ while [ $# -ne 0 ]; do
 	if [ -z "$1" ]; then
 		break
 
-	elif [ "$1" = "-h" ] || [ "$1" = "-H" ] || [ "$1" = "--help" ] || [ "$1" = "--HELP" ]; then
+	elif echo "$1" | grep -q -i -e "^-h$" -e "^--help$"; then
 		PrintUsage "${PRGNAME}"
 		exit 0
 
-	elif [ "$1" = "-s" ] || [ "$1" = "-S" ] || [ "$1" = "--set" ] || [ "$1" = "--SET" ]; then
+	elif echo "$1" | grep -q -i -e "^-s$" -e "^--set$"; then
 		if [ -n "${PROC_MODE}" ]; then
 			echo "[ERROR] already specified --set(-s) or --restore(-r) option"
 			exit 1
 		fi
 		PROC_MODE="set"
 
-	elif [ "$1" = "-r" ] || [ "$1" = "-R" ] || [ "$1" = "--restore" ] || [ "$1" = "--RESTORE" ]; then
+	elif echo "$1" | grep -q -i -e "^-r$" -e "^--restore$"; then
 		if [ -n "${PROC_MODE}" ]; then
 			echo "[ERROR] already specified --set(-s) or --restore(-r) option"
 			exit 1