From a60faa7fd4e3e64857d7e4203ae1c2bdb3465a96 Mon Sep 17 00:00:00 2001 From: raildex1 Date: Mon, 24 Apr 2017 19:22:51 +1000 Subject: [PATCH] Added warning for import error yaml - use venv before use. --- scratchablock/install | 10 +++++++--- scratchablock/uninstall | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/scratchablock/install b/scratchablock/install index 2d1a444..0070b5e 100755 --- a/scratchablock/install +++ b/scratchablock/install @@ -1,10 +1,14 @@ #!/bin/bash -ex -ctf-tools-pip3 install --upgrade nose -ctf-tools-pip3 install --upgrade pyyaml +#move to ctftools virtual env - warning you'll have to activate the +#virtualenv to use the scripts unless you install the pypl packages +#outside the venv for Python 3 +source ctf-tools-venv-activate3 + +pip install --upgrade nose +pip install --upgrade pyyaml git clone --recursive https://github.com/pfalcon/ScratchABlock -source ctf-tools-venv-activate3 mkdir -p bin cd bin diff --git a/scratchablock/uninstall b/scratchablock/uninstall index 1d8c436..c6a90fb 100755 --- a/scratchablock/uninstall +++ b/scratchablock/uninstall @@ -1,3 +1,4 @@ #!/bin/bash -ex ctf-tools-pip3 uninstall -y nose || true +ctf-tools-pip3 uninstall -y pyyaml || true