Merge pull request #628 from nikmartin/linuxBuild

remove 'm' from SO var on Linux and OSX
Merge pull request #627 from ptman/patch-1
2024-10-31 22:05:58 +00:00 · 2020-03-04 19:34:49 -06:00 · 2020-03-04 19:34:38 -06:00 · 2020-03-04 19:30:30 -06:00 · 2020-03-04 19:29:01 -06:00 · 2020-02-26 15:39:39 -06:00
4 changed files with 8 additions and 8 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,15 +5,15 @@ install:
 script: tox
 matrix:
        include:
                - os: "linux"
                  dist: "xenial"
                  python: "3.5"
                - os: "linux"
                  dist: "xenial"
                  python: "3.6"
                - os: "linux"
                  dist: "xenial"
                  python: "3.7"
                - os: "linux"
                  dist: "xenial"
                  python: "3.8"
                - os: "windows"
                  language: shell
                  python: "3.7"
--- a/2
+++ b/2
@ -15,7 +15,7 @@ ifeq ($(shell ${PYTHON} -c "import platform; print(platform.system())"), Windows
 	VENV_OPTIONS = 
 else
 	BIN = bin
-	SO = cpython-3$(PYTHON_VERSION_MINOR)m*.so
+	SO = cpython-3$(PYTHON_VERSION_MINOR)*.so
 	VENV_OPTIONS = --system-site-packages
 endif
--- a/pkg/debian/Makefile
+++ b/pkg/debian/Makefile
@ -6,6 +6,6 @@ all:
 	touch build_pe_modules.py
 	python3 build_pe_modules.py
 	chmod +x src/run.py
-	cp -R src/ $(CURDIR)/debian/{pkgname}/usr/share/{execname}
+	cp -R src/ "$(CURDIR)/debian/{pkgname}/usr/share/{execname}"
-	cp $(CURDIR)/debian/{execname}.desktop $(CURDIR)/debian/{pkgname}/usr/share/applications
+	cp "$(CURDIR)/debian/{execname}.desktop" "$(CURDIR)/debian/{pkgname}/usr/share/applications"
-	ln -s /usr/share/{execname}/run.py $(CURDIR)/debian/{pkgname}/usr/bin/{execname}
+	ln -s "/usr/share/{execname}/run.py" "$(CURDIR)/debian/{pkgname}/usr/bin/{execname}"
--- a/tox.ini
+++ b/tox.ini
@ -1,5 +1,5 @@
 [tox]
-envlist = py35,py36,py37
+envlist = py36,py37,py38
 skipsdist = True
 skip_missing_interpreters = True
Author	SHA1	Message	Date
Andrew Senetar	c4a6958ef0	Merge pull request #628 from nikmartin/linuxBuild remove 'm' from SO var on Linux and OSX	2020-03-04 19:34:49 -06:00
Andrew Senetar	98c6f12b39	Merge pull request #627 from ptman/patch-1 Fix handling of filenames with space	2020-03-04 19:34:38 -06:00
Andrew Senetar	5d21454789	Update .travis.yml Remove python 3.5 and add 3.8	2020-03-04 19:30:30 -06:00
Andrew Senetar	3e4fe5b765	Update tox.ini Remove python 3.5 add 3.8	2020-03-04 19:29:01 -06:00
Nik Martin	bd0f53bcbe	remove 'm' from SO var on Linux and OSX	2020-02-26 15:39:39 -06:00
Paul Tötterman	d820fcc7b1	Fix handling of filenames with space I got spaces in CURDIR for some reason	2020-02-21 16:02:30 +02:00