-
-
Save pwl/5bce940f7da8ed1552e60e4736306078 to your computer and use it in GitHub Desktop.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -aur ncbi-vdb-2.6.3.pristine/build/Makefile.install ncbi-vdb-2.6.3.new/build/Makefile.install | |
--- ncbi-vdb-2.6.3.pristine/build/Makefile.install 2016-06-21 18:44:24.984945996 +0000 | |
+++ ncbi-vdb-2.6.3.new/build/Makefile.install 2016-06-21 18:44:47.754945183 +0000 | |
@@ -66,11 +66,7 @@ | |
PROFILE_FILE = $(ROOT)/etc/profile.d/ncbi-vdb | |
KONFIG_DIR = $(ROOT)/etc/ncbi/ | |
-ifeq (linux, $(OS)) | |
- ifeq (0, $(shell id -u)) | |
- LINUX_ROOT = true | |
- endif | |
-endif | |
+LINUX_ROOT = false | |
install: copylibs copyincludes | |
ifeq (true, $(LINUX_ROOT)) | |
diff --git a/test/cipher/test.sh b/test/cipher/test.sh | |
--- a/test/cipher/test.sh | |
+++ b/test/cipher/test.sh | |
@@ -6,8 +6,8 @@ | |
#installing cipher module into newly created virtual env | |
-tmp_py_env=temp_env | |
+tmp_py_env=$(pwd)/temp_env | |
python_bin=$(which python2) | |
echo $python_bin | |
-if [$python_bin == ""]; then | |
+if [ $python_bin == "" ]; then | |
python_bin=$(which python) | |
fi | |
virtualenv -p $python_bin $tmp_py_env |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment