From fd33a6cebe1a543bafca4e9e0f34e40e805d71b2 Mon Sep 17 00:00:00 2001 From: William Wernert Date: Mon, 22 Feb 2021 15:32:18 -0500 Subject: [PATCH] Rename script, prompt user to apply if they didn't pass --apply --- salt/common/tools/sbin/{so-rules => so-rule} | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) rename salt/common/tools/sbin/{so-rules => so-rule} (97%) diff --git a/salt/common/tools/sbin/so-rules b/salt/common/tools/sbin/so-rule similarity index 97% rename from salt/common/tools/sbin/so-rules rename to salt/common/tools/sbin/so-rule index 1ca5e1213..173b37074 100644 --- a/salt/common/tools/sbin/so-rules +++ b/salt/common/tools/sbin/so-rule @@ -37,11 +37,20 @@ def print_err(string: str): def check_apply(args: dict): + cmd_arr = ['salt-call', 'state.apply', 'idstools', 'queue=True'] + if args.apply: print('Applying idstools state...') - return subprocess.run(['salt-call', 'state.apply', 'idstools', 'queue=True']) + return subprocess.run(cmd_arr) else: - return 0 + message = 'Would you like to apply your changes now? (y/N) ' + answer = input(message) + while answer.lower() not in [ 'y', 'n', '' ]: + answer = input(message) + if answer.lower() in [ 'n', '' ]: + return subprocess.run(cmd_arr) + else: + return 0 def find_minion_pillar() -> str: