diff --git a/bin/ctf-tools-pip b/bin/ctf-tools-pip index 7e038ef..c9b3f95 100755 --- a/bin/ctf-tools-pip +++ b/bin/ctf-tools-pip @@ -1,11 +1,14 @@ #!/bin/bash set -e -o pipefail +#set -x +# let's stick with python 2 as default PY_VERSION=2 -if [[ "$0" =~ \.+pip3 ]]; then +# check this scripts file ending +if [[ "$0" =~ pip3 ]]; then PY_VERSION=3 fi -if [[ "$0" =~ \.+pip2 ]]; then +if [[ "$0" =~ pip2 ]]; then PY_VERSION=2 fi diff --git a/foresight/install b/foresight/install index 497d341..4e796d3 100755 --- a/foresight/install +++ b/foresight/install @@ -1,13 +1,3 @@ #!/bin/bash -e -git clone --depth 1 https://github.com/ALSchwalm/foresight.git - -# python3 virtualenv -virtualenv -p $(which python3) python3 -source python3/bin/activate -pip install -e foresight - -mkdir -p bin -cd bin -ln -s ../python3/bin/foresee . -cd .. +ctf-tools-pip3 install --upgrade 'git+https://github.com/ALSchwalm/foresight.git' diff --git a/foresight/uninstall b/foresight/uninstall new file mode 100755 index 0000000..a558926 --- /dev/null +++ b/foresight/uninstall @@ -0,0 +1,3 @@ +#!/bin/bash -e + +ctf-tools-pip3 uninstall foresight || true