diff --git a/bash_tools.sh b/bash_tools.sh index 8fef881..5768d0f 100644 --- a/bash_tools.sh +++ b/bash_tools.sh @@ -13,8 +13,6 @@ else DOTFILE_DIR=$(dirname ${BASH_SOURCE[0]})/ fi -source "$DOTFILE_DIR/bash_tools/helper.sh" - function ipinfo(){ local api_str="http://ip-api.com/json/$1?fields=query,country,regionName,city,district,zip,isp,org,reverse,mobile,proxy,hosting" if ! hash python; then @@ -36,7 +34,7 @@ function odict(){ # self host directory function dict(){ - python $DOTFILE_DIR/bash_tools/dict.py $1 + python $DOTFILE_DIR/bash_tools/dict.py $1 $2 } # Linux specific functions diff --git a/bash_tools/helper.sh b/bash_tools/helper.sh deleted file mode 100644 index 35e6870..0000000 --- a/bash_tools/helper.sh +++ /dev/null @@ -1,7 +0,0 @@ -# get self-host server ip -SERVERIP=x.useless.pw - -$(which ifconfig > /dev/null 2>&1) && \ - ip=$(ifconfig | grep -Po "10.0.0.[01][0-9]+") - -[ "$ip" != "" ] && SERVERIP=10.0.0.100