non interactive ww3_from_ftp.sh #603

mickaelaccensi · 2022-02-08T15:41:25Z

Pull Request Summary

change default behavior to automatically download tar files and detect main directory
add options :
-h : print usage
-i : interactive mode
-k : keep tar files

add download option --no-check-certificate

Description

solve issue #578
the new way to use it is to add arguments in the command line :
cd WW3/model/bin/ww3_from_ftp.sh

Issue(s) addressed

fixes #578

Commit Message

non interactive ww3_from_ftp.sh

Check list

Branch is up to date with the authoritative repository (NOAA-EMC) develop branch.
Checked the checklist for a developer submitting to develop.
If a version number update is required, checked the updating version number checklist.
If a new feature was added, a regression test for testing the new feature is added.

Testing

How were these changes tested?
by running the bash script itself

add option --no-check-certificate

aliabdolali

I tested that at my end, it worked as expected.

JessicaMeixner-NOAA

I'm not opposed to this PR as is, but had some different thoughts when I originally made the issue #578 so thought I'd get your thoughts on that before we merge.

model/bin/ww3_from_ftp.sh

JessicaMeixner-NOAA · 2022-02-08T17:29:44Z

model/bin/ww3_from_ftp.sh

+if [ $# -eq 3 ] ; then
+  interactive='n'
+  ww3dir=$1  # [ '../../']
+  wnew=$2    # ['y']


Should we combine this to just have one option?

JessicaMeixner-NOAA · 2022-02-08T17:30:06Z

model/bin/ww3_from_ftp.sh

+interactive='y'
+if [ $# -eq 3 ] ; then
+  interactive='n'
+  ww3dir=$1  # [ '../../']


To be more consistent with other scripts should we update this to be pointing to the model directory instead of the top level directory?

JessicaMeixner-NOAA · 2022-02-08T17:32:14Z

model/bin/ww3_from_ftp.sh

 #Get top level directory of ww3 from user: 
 echo -e "\n\n This script will download data from the ftp for WAVEWATCH III "
 echo -e "Enter the relative path to the main/top level directory, this would "
 echo -e "be '../../' if in the model/bin directory or '.' if already in the "
 echo -e "top/main directory:"
-read ww3dir 
+if [ "$interactive" = "n" ]


This is nice as it allows for previous functionality//backwards compatibility, but we're at a point where we're about to have some big changes and therefore are we willing to break this and just make this a script where you have to give it the model directory path and then you either keep things (optional, make an option) or the default is you do nothing and it doesn't keep things?

mickaelaccensi · 2022-02-09T10:59:23Z

let me know if this version fits better to your expectations :
it can either :
detect the model directory and remove tar (default)
use interactive mode (-i option)
detect the model directory and keep tar (-k option)

JessicaMeixner-NOAA · 2022-02-09T13:14:49Z

Okay, I did something wrong:

$ ./model/bin/ww3_from_ftp.sh model 
[ERROR] input argument not recognized
        use -i for interactive mode
        use -k to keep tar files

If we have -k for keeping the tar files, do we still need to have the "y y"? I thought that was the default behavior now.

JessicaMeixner-NOAA · 2022-02-09T13:15:50Z

model/bin/ww3_from_ftp.sh

+
+model_dir=$(cd $(dirname $(dirname $0)) > /dev/null && pwd -P)
+echo $model_dir
+
 #Get top level directory of ww3 from user: 
 echo -e "\n\n This script will download data from the ftp for WAVEWATCH III "
 echo -e "Enter the relative path to the main/top level directory, this would "
 echo -e "be '../../' if in the model/bin directory or '.' if already in the "
 echo -e "top/main directory:"


If we're giving the path to the model directory, we should change this description or is this still the same?

mickaelaccensi · 2022-02-09T13:55:29Z

Okay, I did something wrong:
$ ./model/bin/ww3_from_ftp.sh model 
[ERROR] input argument not recognized
        use -i for interactive mode
        use -k to keep tar files
If we have -k for keeping the tar files, do we still need to have the "y y"? I thought that was the default behavior now.

you don't need anymore to specify the model directory since it is detected automatically
the only options available now are :
-i for interactive mode (old manner)
-k to force keeping tar files
-h to print usage

mickaelaccensi · 2022-02-09T14:03:03Z

I've added usage to make it clearer and I'm also updating the PR summary

correct option to keep tar files

mickaelaccensi · 2022-02-09T14:47:09Z

ok this version should be the final one unless you see something to change/improve

JessicaMeixner-NOAA · 2022-02-09T14:50:17Z

This is AWESOME!!! Thank you so much @mickaelaccensi

JessicaMeixner-NOAA

The new usage and -h options are really nice. Great improvement! Thank you for implementing this update.

add non interactive feature

7d60a26

add option --no-check-certificate

mickaelaccensi requested review from aliabdolali and JessicaMeixner-NOAA February 8, 2022 15:41

mickaelaccensi self-assigned this Feb 8, 2022

mickaelaccensi added the bin directory change With this PR something with the bin/build has changed label Feb 8, 2022

aliabdolali approved these changes Feb 8, 2022

View reviewed changes

JessicaMeixner-NOAA reviewed Feb 8, 2022

View reviewed changes

new version with interactive or keep options

bda6629

JessicaMeixner-NOAA reviewed Feb 9, 2022

View reviewed changes

update comments

0561b5b

add usage

95e8e80

mickaelaccensi changed the title ~~non iteractive ww3_from_ftp.sh~~ non interactive ww3_from_ftp.sh Feb 9, 2022

improve absolute path detection

934edd6

correct option to keep tar files

JessicaMeixner-NOAA approved these changes Feb 9, 2022

View reviewed changes

JessicaMeixner-NOAA merged commit b144324 into NOAA-EMC:develop Feb 9, 2022

aliabdolali pushed a commit that referenced this pull request Mar 16, 2022

non interactive ww3_from_ftp.sh #603

dc3bb49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

non interactive ww3_from_ftp.sh #603

non interactive ww3_from_ftp.sh #603

mickaelaccensi commented Feb 8, 2022 •

edited

Loading

aliabdolali left a comment

JessicaMeixner-NOAA left a comment

JessicaMeixner-NOAA Feb 8, 2022

JessicaMeixner-NOAA Feb 8, 2022

JessicaMeixner-NOAA Feb 8, 2022

mickaelaccensi commented Feb 9, 2022

JessicaMeixner-NOAA commented Feb 9, 2022

JessicaMeixner-NOAA Feb 9, 2022

mickaelaccensi Feb 9, 2022

mickaelaccensi commented Feb 9, 2022 •

edited

Loading

mickaelaccensi commented Feb 9, 2022

mickaelaccensi commented Feb 9, 2022

JessicaMeixner-NOAA commented Feb 9, 2022

JessicaMeixner-NOAA left a comment

non interactive ww3_from_ftp.sh #603

non interactive ww3_from_ftp.sh #603

Conversation

mickaelaccensi commented Feb 8, 2022 • edited Loading

Pull Request Summary

Description

Issue(s) addressed

Commit Message

Check list

Testing

aliabdolali left a comment

Choose a reason for hiding this comment

JessicaMeixner-NOAA left a comment

Choose a reason for hiding this comment

JessicaMeixner-NOAA Feb 8, 2022

Choose a reason for hiding this comment

JessicaMeixner-NOAA Feb 8, 2022

Choose a reason for hiding this comment

JessicaMeixner-NOAA Feb 8, 2022

Choose a reason for hiding this comment

mickaelaccensi commented Feb 9, 2022

JessicaMeixner-NOAA commented Feb 9, 2022

JessicaMeixner-NOAA Feb 9, 2022

Choose a reason for hiding this comment

mickaelaccensi Feb 9, 2022

Choose a reason for hiding this comment

mickaelaccensi commented Feb 9, 2022 • edited Loading

mickaelaccensi commented Feb 9, 2022

mickaelaccensi commented Feb 9, 2022

JessicaMeixner-NOAA commented Feb 9, 2022

JessicaMeixner-NOAA left a comment

Choose a reason for hiding this comment

mickaelaccensi commented Feb 8, 2022 •

edited

Loading

mickaelaccensi commented Feb 9, 2022 •

edited

Loading