Commit ab3f9ac2 authored by Emeric Verschuur's avatar Emeric Verschuur
Browse files

Merge branch 'fixes' into 'master' 

spelling & interactive mode fixes

See merge request !5
parents 4837f0f1 bc6b4b63

README.md

+1 −1
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ bashopts_process_opts 
## Example



```bash

#!/bin/bash -ei

#!/bin/bash -e



# load the library

. bashopts.sh

bashopts.sh

+2 −2
Original line number Diff line number Diff line
@@ -238,7 +238,7 @@ bashopts_declare() { 
            *)  bashopts_critical "Fatal error";;

        esac

    done

    # Check imcompatible -v and -r options

    # Check incompatible -v and -r options

    if [ -n "${options[default]}" ] && [ "${options[req_value]}" == "true" ]; then

        bashopts_critical "bashopts_declare: -r and -v options cannot be activated at the same time"

    fi
@@ -362,7 +362,7 @@ bashopts_dump_value() { 


# display the formated help

bashopts_diplay_help() {

    local elts optargs_max_len=8 val dval ncol=$COLUMNS

    local elts optargs_max_len=8 val dval ncol=$(tput cols 2>/dev/null || true)

    declare -A optargs

    # compute the good arguments comumn size

    for op in "${bashopts_optlist[@]}"; do

example.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash -ei

#!/bin/bash -e



# load the library

. bashopts.sh

test.sh

+3 −3
Original line number Diff line number Diff line 
#!/bin/bash -ei

#!/bin/bash -e

# Copyright 2017 Emeric Verschuur <emeric@mbedsys.org>

#

# Licensed to the Apache Software Foundation (ASF) under one
@@ -19,7 +19,7 @@ 
# under the License.



if [ "$GITLAB_CI" != "true" ]; then

    exec docker run --rm -ti -e GITLAB_CI=true -v $PWD:$PWD -w $PWD ubuntu:16.04 ./test.sh "$@"

    exec docker run --rm -i -e GITLAB_CI=true -v $PWD:$PWD -w $PWD ubuntu:16.04 ./test.sh "$@"

fi



. bashopts.sh