Ticket 790: Need to fix shebang on ropo script

diff --git a/bin/Makefile b/bin/Makefile
index 0634333..af17347 100644 (file)
--- a/bin/Makefile
+++ b/bin/Makefile
@@ -24,56 +24,12 @@
 ###########################################################################
 -include ../def.mk
 
-
-# Ropo specific c flags
-#
-CFLAGS= $(SHARED_FLAG) $(CCOPTS) $(DEFS) -I../ropo -I. $(PNG_INCLUDE_DIR) \
-                       $(RAVE_INCLUDE_FLAG) $(HLHDF_INCLUDE_FLAG) $(ZLIB_INCDIR) \
-                       $(HDF5_INCDIR) $(PROJ_INCLUDE_FLAG)
-
-# Linker flags
-#
-LDFLAGS= -L../ropo -L. $(PNG_LIB_DIR) $(RAVE_LIB_FLAG) $(HLHDF_LIBRARY_FLAG) $(ZLIB_LIBDIR) \
-                       $(HDF5_LIBDIR) $(PROJ_LIB_FLAG) 
-
-# We also need to ensure that raves expat requirements are managed
-EXPAT_LIBRARY=
-ifeq ($(EXPAT_SUPPRESSED), no)
-CFLAGS+= $(EXPAT_INCLUDE_DIR) -DRAVE_XML_SUPPORTED
-LDFLAGS+= $(EXPAT_LIB_DIR)
-EXPAT_LIBRARY=-lexpat
-endif
-
-# --------------------------------------------------------------------
-# Fixed definitions
-
-SOURCES= ropo.c 
-
-OBJECTS= $(SOURCES:.c=.o)
-TARGET= bropo
-
-MAKECDEPEND=$(CC) -MM $(CFLAGS) -MT '$(@F)' -o $(DF).d $<
-
-DEPDIR=.dep
-DF=$(DEPDIR)/$(*F)
-
-# Ensures that the .dep directory exists
-.PHONY=$(DEPDIR)
-$(DEPDIR):
-       +@[ -d $@ ] || mkdir -p $@
-
-# And the rest of the make file targets
-#
-.PHONY=all
-all:           $(TARGET)
-
-$(TARGET): $(DEPDIR) $(OBJECTS) ../ropo/libbropo.so
-       $(LDSHARED) -o $@ $(LDFLAGS) $(OBJECTS)
+all: 
 
 .PHONY=install
 install:
-       @mkdir -p ${DESTDIR}${prefix}/bin/
-       @cp -v -f ropo ${DESTDIR}${prefix}/bin/
+       @mkdir -p "${DESTDIR}${prefix}/bin"
+       @./fix_shebang.sh ${PYTHON_BIN} ropo "${DESTDIR}${prefix}/bin"
 
 .PHONY=clean
 clean:
@@ -83,18 +39,3 @@ clean:
 .PHONY=distclean                
 distclean:     clean
        @\rm -f $(TARGET)
-
-# --------------------------------------------------------------------
-# Rules
-
-%.o : %.c
-       @$(MAKECDEPEND); \
-       cp $(DF).d $(DF).P; \
-       sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \
-               -e '/^$$/ d' -e 's/$$/ :/' < $(DF).d >> $(DF).P; \
-       \rm -f $(DF).d
-       $(CC) -c $(CFLAGS) $< -o $@
-
-
-# NOTE! This ensures that the dependencies are setup at the right time so this should not be moved
--include $(SOURCES:%.c=$(DEPDIR)/%.P)

diff --git a/bin/fix_shebang.sh b/bin/fix_shebang.sh
new file mode 100755 (executable)
index 0000000..7e72ce1
--- /dev/null
+++ b/bin/fix_shebang.sh
@@ -0,0 +1,35 @@
+#!/bin/sh
+###########################################################################
+# Copyright (C) 2012 Swedish Meteorological and Hydrological Institute, SMHI,
+#
+# This file is part of RAVE.
+#
+# RAVE is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+# 
+# RAVE is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+# 
+# You should have received a copy of the GNU Lesser General Public License
+# along with RAVE.  If not, see <http://www.gnu.org/licenses/>.
+# ------------------------------------------------------------------------
+# 
+# Fixes the shebang line in the python scripts
+# @file
+# @author Anders Henja (Swedish Meteorological and Hydrological Institute, SMHI)
+# @date 2018-04-01
+############################################################################
+
+if [ $# -ne 3 ]; then
+  echo "Must specify <python binary> <file to be modifed> <full path to installation>"
+  exit 127
+fi
+
+cat $2 | sed -e '1s/.*python.*/#!\/usr\/bin\/env '$1'/' > "$3/$2"
+chmod 755 "$3/$2"
+echo "Copied $2 => $3/$2"
+