diff options
author | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-16 01:17:54 -0400 |
---|---|---|
committer | Luke Shumaker <lukeshu@lukeshu.com> | 2018-08-16 01:18:06 -0400 |
commit | bd382780bbbe1f150288b24fe713820b2d3e7921 (patch) | |
tree | 9d6c63ed4862b19c332c1082013defc2f1255dc1 | |
parent | 904d2c43e181f4081ee5ca9c9391921f14d6bb4b (diff) |
osi-mk: Tidy arg checking, require --size for new images
-rwxr-xr-x | osi-mk | 20 |
1 files changed, 13 insertions, 7 deletions
@@ -77,7 +77,7 @@ main() { local arg_orig=("$@") local arg_mode=outside local arg_mountpoint= - local arg_size=1G + local arg_size= local arg_edit=false local arg_edit_base= @@ -130,6 +130,18 @@ main() { arg_mode=error fi done + if [[ ( $arg_edit = false || -n $arg_edit_base ) && -e $arg_file ]]; then + error 2 'Image file already exists, refusing to overwrite: %s' "$arg_file" + fi + if $arg_edit; then + if ! [[ -f ${arg_edit_base:-$arg_file} ]]; then + error 2 'Image must already exist to --edit: %s' "${arg_edit_base:-$arg_file}" + fi + else + if [[ -z $arg_size ]]; then + error 2 'Must specify --size when creating a new image' + fi + fi ;; esac fi @@ -161,13 +173,7 @@ main() { # main code starts here outside) - if [[ ( $arg_edit = false || -n $arg_edit_base ) && -e $arg_file ]]; then - error 1 'Image file already exists, refusing to overwrite: %s' "$arg_file" - fi if $arg_edit; then - if ! [[ -f "${arg_edit_base:-$arg_file}" ]]; then - error 1 'Image must already exist to --edit: %s' "${arg_edit_base:-$arg_file}" - fi if [[ -n $arg_edit_base ]]; then printf -v prefix "$(gettext -- '%s [format]')" "$NAME" { |