From a83fb37c6c60b3cf17269a38e4c034aeffe78968 Mon Sep 17 00:00:00 2001 From: psycho Date: Wed, 3 Feb 2021 22:46:38 +0100 Subject: [PATCH] reformat output reformated output --- Jenkinsfile | 3 ++- scripts/sftp_test.py | 8 ++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 846174a..b554caa 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -135,7 +135,8 @@ def checkout() throw new Exception("Error checking out OWRT") } script = 'set +x; python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ' + params.SFTP_PASSWD + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path + '; set -x' - printDebug(script) + script_print = 'set +x; python ' + scripts_path + 'sftp_test.py -a ' + sftp_host + ' -u ' + sftp_user + ' -p ************' + ' -g ' + git_folder + ' -f ' + scripts_path + known_hosts + ' -l ' + sftp_path + '; set -x' + printDebug(script_print) def ret = sh label: 'is_build_needed', script: script, returnStdout: true if(ret.trim().equalsIgnoreCase('True')) { diff --git a/scripts/sftp_test.py b/scripts/sftp_test.py index f90435e..cc8e73f 100644 --- a/scripts/sftp_test.py +++ b/scripts/sftp_test.py @@ -31,11 +31,11 @@ def usage(): print('usage: ' + os.path.basename(sys.argv[0]) + ' -a -u -p -f -g -l [-d] [-v]\n') print('arguments:') print('\t-a --host=\t\thost to connect') - print('\t-a --user=\t\tusername') + print('\t-u --user=\t\tusername') print('\t-p --passwd=\t\tpassword') - print('\t-f --host_file=\tknown host file') - print('\t-g --git_link=\tpath to git repo') - print('\t-l --sftp_path=\tpath to builds') + print('\t-f --host_file=\t\tknown host file') + print('\t-g --git_link=\t\tpath to git repo') + print('\t-l --sftp_path=\t\tpath to builds') print('optional:') print('\t-d --debug\t\t') print('\t-v --version\t\tprints version of script')