1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102
|
Author: Alastair McKinstry <mckinstry@debian.org>
Description: Ensure all scripts have a correct start line
and paths are correct in Metview
Forwarded: not-needed
Last-Updated: 2020-03-23
--- a/metview/scripts/document_macros.pl
+++ b/metview/scripts/document_macros.pl
@@ -1,4 +1,4 @@
-
+#!/usr/bin/perl
# **************************** LICENSE START ***********************************
#
# Copyright 2012 ECMWF and INPE. This software is distributed under the terms
--- a/metview/scripts/mv_flextra_prep.mv
+++ b/metview/scripts/mv_flextra_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview
# Metview Macro
# **************************** LICENSE START ***********************************
--- a/metview/scripts/mv_mars_catalog.py
+++ b/metview/scripts/mv_mars_catalog.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
# Copyright 2012 ECMWF and INPE. This software is distributed under the terms
# of the Apache License version 2.0. In applying this license, ECMWF does not
# waive the privileges and immunities granted to it by virtue of its status as
--- a/metview/scripts/mv_scm_vis.mv
+++ b/metview/scripts/mv_scm_vis.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/metview
# Metview Macro
# **************************** LICENSE START ***********************************
--- a/metview/scripts/mv_vapor_prep.mv
+++ b/metview/scripts/mv_vapor_prep.mv
@@ -1,3 +1,4 @@
+#!/usr/bin/magml
# Metview Macro
# **************************** LICENSE START ***********************************
@@ -1020,4 +1021,4 @@
return s
-end listToString
\ No newline at end of file
+end listToString
--- a/metview/scripts/metview_base.in
+++ b/metview/scripts/metview_base.in
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash
# **************************** LICENSE START ***********************************
#
@@ -18,13 +18,15 @@
#
WMO_SITE_NR=@SITE_WMO_CODE@
##QT_DIR_LIB=/usr/local/apps/qt/4.6.2-64/lib
+ARCH=`dpkg-architecture -qDEB_HOST_MULTIARCH`
+METVIEW_BIN=/usr/lib/$ARCH/metview
PATH=@NETCDF_BIN@:@ODB_API_BIN_DIR@:${PATH}
-INSTALLDIR=@CMAKE_INSTALL_PREFIX@
+INSTALLDIR=/usr/share/metview
METVIEW_SCRIPT=@METVIEW_SCRIPT@
MV_MARS_ACCESS=@MARS_ACCESS@
#MARS_HOME=${METVIEW_MARS_HOME:=@MARS_HOME@}
METVIEW_MARS_COMMAND=${METVIEW_MARS_COMMAND:=@MARS_COMMAND@}
-METVIEW_DIR_DEV=@CMAKE_BINARY_DIR@
+METVIEW_DIR_DEV=/usr/share/metview
METVIEW_TITLE_PROD="Production @EXTRA_TITLE@"
METVIEW_TITLE_DEV="Development @EXTRA_TITLE@"
MV_ENVIRON=@MV_ENVIRON@
@@ -53,7 +55,7 @@
MV_BUNDLE_CONTAINS_EMOSLIB=x@MV_BUNDLE_CONTAINS_EMOSLIB@
MV_BUNDLE_CONTAINS_ECCODES=x@MV_BUNDLE_CONTAINS_ECCODES@
-MV_BUNDLE_SRC=@METVIEW_BUNDLE_SRC@
+MV_BUNDLE_SRC=/build/metview
METVIEW_QT5=@METVIEW_QT5@
MV_MIR=@HAVE_PPROC_MIR@
@@ -524,7 +526,7 @@
dev)
METVIEW_DIR=${METVIEW_DIR_DEV}
- METVIEW_DIR_SHARE=${METVIEW_DIR_DEV}/share/metview
+ METVIEW_DIR_SHARE=${METVIEW_DIR_DEV}
METVIEW_BIN=${METVIEW_BIN:=$METVIEW_DIR/bin}
METV_DEV=yes
MV_DEBUG_PRINT=${MV_DEBUG_PRINT:=1}
@@ -565,7 +567,7 @@
prod)
METVIEW_DIR=$INSTALLDIR
- METVIEW_DIR_SHARE=${METVIEW_DIR}/share/metview
+ METVIEW_DIR_SHARE=${METVIEW_DIR}
METVIEW_BIN=${METVIEW_BIN:=$METVIEW_DIR/@MV_BIN_DIR@}
METVIEW_LIB=$METVIEW_DIR/@MV_INSTALL_LIB_DIR@
LD_LIBRARY_PATH=$METVIEW_LIB:$LD_LIBRARY_PATH
|