The fix to add "-S" to "env" to allow the "-B" switch to be passed to python apparently doesn't work in CentOS, so both switches have been removed. Moved the cdl2spi.py script back to common/ because it is used by scripts in both common/ and runtime/; an additional line in the top-level Makefile is then needed to install cdl2spi.py.
diff --git a/Makefile.in b/Makefile.in index 506a67e..0aee50c 100644 --- a/Makefile.in +++ b/Makefile.in
@@ -99,6 +99,9 @@ $(datadir)/pdk/$$file ;\ done ;\ mv $(datadir)/pdk/runtime/* $(datadir)/pdk/scripts ;\ + # cdl2spi.py is the one file used by scripts in both the + # common/ and runtime/ directories. + ${CPP} -DPREFIX=$(datadir) common/cdl2spi.py $(datadir)/pdk/scripts ;\ rm -r -f $(datadir)/pdk/runtime ;\ echo "Common install: Done." ;\ else \
diff --git a/VERSION b/VERSION index 4de9573..7249ada 100644 --- a/VERSION +++ b/VERSION
@@ -1 +1 @@ -1.0.218 +1.0.219
diff --git a/runtime/cdl2spi.py b/common/cdl2spi.py similarity index 100% rename from runtime/cdl2spi.py rename to common/cdl2spi.py
diff --git a/runtime/cace.py b/runtime/cace.py index 9de1a7e..6106677 100755 --- a/runtime/cace.py +++ b/runtime/cace.py
@@ -1,4 +1,4 @@ -#!/usr/bin/env -S python3 -B +#!/usr/bin/env python3 # #-------------------------------------------------------- # Project Manager GUI.
diff --git a/runtime/cace_datasheet_upload.py b/runtime/cace_datasheet_upload.py index 7c6b019..af5db63 100755 --- a/runtime/cace_datasheet_upload.py +++ b/runtime/cace_datasheet_upload.py
@@ -1,4 +1,4 @@ -#!/usr/bin/env -S python3 -B +#!/usr/bin/env python3 # # cace_datasheet_upload.py #
diff --git a/runtime/make_icon_from_soft.py b/runtime/make_icon_from_soft.py index 2323646..46f27e8 100644 --- a/runtime/make_icon_from_soft.py +++ b/runtime/make_icon_from_soft.py
@@ -1,4 +1,4 @@ -#!/usr/bin/env -S python3 -B +#!/usr/bin/env python3 #-------------------------------------------------------- # make_icon_from_soft.py -- #
diff --git a/runtime/project_manager.py b/runtime/project_manager.py index 245eeee..b47f23e 100755 --- a/runtime/project_manager.py +++ b/runtime/project_manager.py
@@ -1,4 +1,4 @@ -#!/usr/bin/env -S python3 -B +#!/usr/bin/env python3 # #-------------------------------------------------------- # Open Galaxy Project Manager GUI.
diff --git a/runtime/rename_project.py b/runtime/rename_project.py index 01ccf0b..4d541f0 100755 --- a/runtime/rename_project.py +++ b/runtime/rename_project.py
@@ -1,4 +1,4 @@ -#!/usr/bin/env -S python3 -B +#!/usr/bin/env python3 # # rename_project.py --- Perform all tasks required for renaming a project. #