From 3d66b53ceb985014b0ae72cad6cafe8c07325209 Mon Sep 17 00:00:00 2001 From: Christian Muck Date: Fri, 16 Sep 2011 14:37:31 +0200 Subject: Bugfix [GSW-72] Can't open /etc/rc.d/init.d/functions. Provide versions for different distros --- CMakeLists.txt | 17 ++-- automotive-dlt.spec.cheetah | 103 --------------------- automotive-dlt.spec.cmake | 89 +++++++++++++++++++ distfiles | 4 +- include/dlt/dlt_version.h | 2 +- testscripts/CMakeLists.txt | 36 +++++++- testscripts/Meego/dlt-daemon.cmake | 83 +++++++++++++++++ testscripts/Ubuntu/dlt-daemon.cmake | 172 ++++++++++++++++++++++++++++++++++++ testscripts/dltdaemon | 64 -------------- testscripts/dltinfo.sh | 24 ----- transform_spec_file.py | 11 --- 11 files changed, 384 insertions(+), 221 deletions(-) delete mode 100755 automotive-dlt.spec.cheetah create mode 100644 automotive-dlt.spec.cmake create mode 100755 testscripts/Meego/dlt-daemon.cmake create mode 100755 testscripts/Ubuntu/dlt-daemon.cmake delete mode 100755 testscripts/dltdaemon delete mode 100755 testscripts/dltinfo.sh delete mode 100755 transform_spec_file.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a18fcd..c36f5bb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -61,8 +61,8 @@ IF(NOT DEFINED PRINT_REVISION) OUTPUT_STRIP_TRAILING_WHITESPACE) ENDIF(NOT DEFINED PRINT_REVISION) -##################### RPM CONFIG ######################## -SET( GENIVI_RPM_RELEASE "1${IDLT_VERSION}") +##################### RPM SPEC CONFIG ######################## +SET( GENIVI_RPM_RELEASE "1${PRINT_REVISION}") SET( LICENSE "LGPL v2.1 with special exception" ) SET( SPEC_DIR "package") @@ -180,7 +180,9 @@ CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/doxygen.cfg.cmake ${CMAKE_SOURCE_DIR}/doxygen CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/automotive-dlt.pc.cmake ${CMAKE_SOURCE_DIR}/automotive-dlt.pc @ONLY) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt.service @ONLY) CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service.cmake ${CMAKE_SOURCE_DIR}/systemd/dlt-syslog.service @ONLY) -#CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/package/automotive-dlt.spec.cmake ${CMAKE_SOURCE_DIR}/package/automotive-dlt.spec ESCAPE_QUOTES) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/testscripts/Meego/dlt-daemon.cmake ${CMAKE_SOURCE_DIR}/testscripts/Meego/dlt-daemon @ONLY) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/testscripts/Ubuntu/dlt-daemon.cmake ${CMAKE_SOURCE_DIR}/testscripts/Ubuntu/dlt-daemon @ONLY) +CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/automotive-dlt.spec.cmake ${CMAKE_SOURCE_DIR}/automotive-dlt.spec ESCAPE_QUOTES) OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON ) OPTION(ENABLE_BUILD_DOC "Set to ON to build Documentation" OFF) @@ -229,15 +231,6 @@ INSTALL(FILES LICENSE.txt DESTINATION doc/dlt2 COMPONENT base) -message(STATUS "python ${CMAKE_CURRENT_SOURCE_DIR}/transform_spec_file.py ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.spec.cheetah ${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.spec BUILD_DOC=${ENABLE_BUILD_DOC}") - -add_custom_command(OUTPUT "${CMAKE_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.spec" - COMMAND "python" "${CMAKE_CURRENT_SOURCE_DIR}/transform_spec_file.py" "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.spec.cheetah" "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.spec" "BUILD_DOC=${ENABLE_BUILD_DOC}" - DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/${CMAKE_PROJECT_NAME}.spec.cheetah") - -add_custom_target(specfile - DEPENDS "${CMAKE_PROJECT_NAME}.spec") - CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake_uninstall.cmake.in" diff --git a/automotive-dlt.spec.cheetah b/automotive-dlt.spec.cheetah deleted file mode 100755 index 10c1866..0000000 --- a/automotive-dlt.spec.cheetah +++ /dev/null @@ -1,103 +0,0 @@ -Name: automotive-dlt -Summary: %{name} - Diagnostic Log and Trace -Version: 2.2.0 -Release: 1 -License: LGPLv2.1 with special exception -Group: System Environment/Base -Vendor: BMW Group AG -Source: %{name}-%{version}.tar.gz -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root -Requires: %{name} = %{version}-%{release}, pkgconfig - -%description -This component provides a standardised log and trace interface, based on the -standardised protocol specified in the AUTOSAR standard 4.0 DLT. -This component can be used by GENIVI components and other applications as -logging facility providing -- the DLT shared library -- the DLT daemon, including startup scripts -- the DLT daemon adaptors -- the DLT client console utilities -- the DLT test applications - -%package doc -Summary: %{name} - Diagnostic Log and Trace: Documentation -Group: Documentation - -%description doc -This component provides the documentation for %{name}. - -%package devel -Summary: %{name} - Diagnostic Log and Trace: Development files -Group: Development/Libraries -Requires: %{name} = %{version}-%{release}, pkgconfig - -%description devel -This component provides the development libraries and includes for %{name}. - -%prep -%setup -echo "building package automotive-dlt" - -%build -#if $BUILD_DOC == "ON" -%configure --enable-build-doc -#else -%configure -#end if -make - -%install -rm -rf \$RPM_BUILD_ROOT -make install DESTDIR=\$RPM_BUILD_ROOT -mkdir -p \$RPM_BUILD_ROOT/etc/init.d -/usr/bin/install -c -m 755 testscripts/dltdaemon \$RPM_BUILD_ROOT/etc/init.d - -%clean -rm -rf \$RPM_BUILD_ROOT - -%files -/etc/init.d/dltdaemon -%{_libdir}/libdlt.so.2 -%{_libdir}/libdlt.so.2.2.0 -%{_libdir}/libdlt.so -%attr(0755,root,root) %{_bindir}/dltinfo.sh -%{_bindir}/dlt-convert -%{_bindir}/dlt-receive -%{_bindir}/dlt-adaptor-stdin -%{_bindir}/dlt-adaptor-udp -%{_bindir}/dlt-test-client -%{_bindir}/dlt-test-user -%{_bindir}/dlt-test-stress -%{_bindir}/dlt-test-internal -%attr(0755,root,root) %{_bindir}/dlt-daemon -%{_bindir}/dlt-example-user -%{_bindir}/dlt-example-user-func -%{_bindir}/dltdaemon - - -%files doc -%{_usr}/doc/dlt2/LICENSE.txt -#if $BUILD_DOC == "ON" -/usr/local/doc/%{name}/GENIVI_UserManual_DLT_Daemon.odt -/usr/local/doc/%{name}/GENIVI_UserManual_DLT_Daemon.pdf -/usr/local/doc/%{name}/GENIVI_Specification_DLT_Daemon.odt -/usr/local/doc/%{name}/GENIVI_Specification_DLT_Daemon.pdf -/usr/local/doc/%{name}/GENIVI_UserManual_DLT_Client.odt -/usr/local/doc/%{name}/GENIVI_UserManual_DLT_Client.pdf -/usr/local/doc/%{name}/GENIVI_Specification_DLT_Daemon.vsd -#end if - - -%files devel -%{_libdir}/pkgconfig/*.pc -%{_includedir}/dlt/*.h -%{_libdir}/pkgconfig/automotive-dlt.pc - -%pre - -%post - -%changelog -* Wed Nov 24 2010 dlt_maintainer 2.2.0 -- Creation diff --git a/automotive-dlt.spec.cmake b/automotive-dlt.spec.cmake new file mode 100644 index 0000000..1056da1 --- /dev/null +++ b/automotive-dlt.spec.cmake @@ -0,0 +1,89 @@ +Name: @PROJECT_NAME@ +Summary: %{name} - Diagnostic Log and Trace +Version: @PRINT_MAJOR_VERSION@.@PRINT_MINOR_VERSION@.@PRINT_PATCH_LEVEL@ +Release: @GENIVI_RPM_RELEASE@ +License: @LICENSE@ +Group: System Environment/Base +Vendor: BMW Group AG +Source: %{name}-%{version}.tar.gz +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description +This component provides a standardised log and trace interface, based on the +standardised protocol specified in the AUTOSAR standard 4.0 DLT. +This component can be used by GENIVI components and other applications as +logging facility providing +- the DLT shared library +- the DLT daemon, including startup scripts +- the DLT daemon adaptors +- the DLT client console utilities +- the DLT test applications + +%package doc +Summary: %{name} - Diagnostic Log and Trace: Documentation +Group: Documentation + +%description doc +This component provides the documentation for %{name}. + +%package devel +Summary: %{name} - Diagnostic Log and Trace: Development files +Group: Development/Libraries +Requires: %{name} = %{version}-%{release}, pkgconfig + +%description devel +This component provides the development libraries and includes for %{name}. + +%prep +%setup +echo "building package automotive-dlt" + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT +mkdir -p $RPM_BUILD_ROOT/etc/init.d +/usr/bin/install -c -m 755 testscripts/Ubuntu/dlt-daemon $RPM_BUILD_ROOT/etc/init.d + +%clean +rm -rf $RPM_BUILD_ROOT + +%files +/etc/init.d/dlt-daemon +%{_libdir}/libdlt.so.2 +%{_libdir}/libdlt.so.2.2.0 +%{_libdir}/libdlt.so +%{_bindir}/dlt-convert +%{_bindir}/dlt-receive +%{_bindir}/dlt-adaptor-stdin +%{_bindir}/dlt-adaptor-udp +%{_bindir}/dlt-test-client +%{_bindir}/dlt-test-user +%{_bindir}/dlt-test-stress +%{_bindir}/dlt-test-internal +%attr(0755,root,root) %{_bindir}/dlt-daemon +%{_bindir}/dlt-example-user +%{_bindir}/dlt-example-user-func + + + +%files doc +%{_usr}/doc/dlt2/LICENSE.txt + + +%files devel +%{_libdir}/pkgconfig/*.pc +%{_includedir}/dlt/*.h +%{_libdir}/pkgconfig/automotive-dlt.pc + +%pre + +%post + +%changelog +* Wed Nov 24 2010 dlt_maintainer 2.2.0 +- Creation diff --git a/distfiles b/distfiles index 98429a9..9a74daf 100755 --- a/distfiles +++ b/distfiles @@ -1,12 +1,10 @@ CMakeLists.txt (src|include|wxctb|testscripts|doc).*CMakeLists.txt (src|include|wxctb|testscripts).*\.(cpp|h|c|cxx) -testscripts/dltdaemon -testscripts/dltinfo\.sh +testscripts/Ubuntu/dlt-daemon doc/.*\.(odt|vsd) configure distfiles -#automotive-dlt.spec.cheetah package/automotive-dlt.spec.in cmake_uninstall.cmake.in [^/]*\.cmake diff --git a/include/dlt/dlt_version.h b/include/dlt/dlt_version.h index c1e7b06..1ea8756 100755 --- a/include/dlt/dlt_version.h +++ b/include/dlt/dlt_version.h @@ -7,6 +7,6 @@ #define PACKAGE_MAJOR_VERSION "2" #define PACKAGE_MINOR_VERSION "3" #define PACKAGE_PATCH_LEVEL "0" -#define PACKAGE_REVISION "v2.2.0-14-g27b7b43" +#define PACKAGE_REVISION "v2.3.0" #endif diff --git a/testscripts/CMakeLists.txt b/testscripts/CMakeLists.txt index 28e75f7..16d618f 100755 --- a/testscripts/CMakeLists.txt +++ b/testscripts/CMakeLists.txt @@ -34,7 +34,37 @@ # # @licence end@ ######## - -install(PROGRAMS dltdaemon dltinfo.sh - DESTINATION bin +if(UNIX) + if(CMAKE_SYSTEM_NAME MATCHES "Linux") + if(EXISTS "/etc/issue") + FILE(READ "/etc/issue" LINUX_ISSUE) + # Fedora case + if(LINUX_ISSUE MATCHES "Fedora") + set(DISTRIBUTION "Fedora") + endif(LINUX_ISSUE MATCHES "Fedora") + # Ubuntu case + if(LINUX_ISSUE MATCHES "Ubuntu") + set(DISTRIBUTION "Ubuntu") + endif(LINUX_ISSUE MATCHES "Ubuntu") + # Debian case + if(LINUX_ISSUE MATCHES "Debian") + set(DISTRIBUTION "Debian") + endif(LINUX_ISSUE MATCHES "Debian") + # Open SuSE case + if(LINUX_ISSUE MATCHES "SUSE") + set(DISTRIBUTION "SUSE") + endif(LINUX_ISSUE MATCHES "SUSE") + if(LINUX_ISSUE MATCHES "Meego") + set(DISTRIBUTION "Meego") + endif(LINUX_ISSUE MATCHES "Meego") + + install(PROGRAMS ${DISTRIBUTION}/dlt-daemon + DESTINATION /etc/init.d/ COMPONENT base) + + endif(EXISTS "/etc/issue") + endif(CMAKE_SYSTEM_NAME MATCHES "Linux") +endif(UNIX) + + + diff --git a/testscripts/Meego/dlt-daemon.cmake b/testscripts/Meego/dlt-daemon.cmake new file mode 100755 index 0000000..a2e908e --- /dev/null +++ b/testscripts/Meego/dlt-daemon.cmake @@ -0,0 +1,83 @@ +#!/bin/sh +# +# Starts the DLT Daemon +# +# chkconfig: 2345 21 87 +# description: Provides DLT Debug Logging & Trace functionality +# processname: dlt-daemon + +# Source function library. +. /etc/rc.d/init.d/functions + + +processname=dlt-daemon +processpath=@CMAKE_INSTALL_PREFIX@/bin +servicename=dlt-daemon + + +[ -x $processpath ] || exit 0 + +start() { + echo -n $"Starting $processname daemon: " + @CMAKE_INSTALL_PREFIX@/bin/dlt-daemon -d +} + +stop() { + echo -n $"Stopping $processname daemon: " + killproc $servicename -TERM + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$servicename +} + +RETVAL=0 + +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart) + stop + start + ;; + condrestart) + if [ -f /var/lock/subsys/$servicename ]; then + stop + start + fi + ;; + reload) + restart + ;; + status) + status $processname + pidofdlt=`pidof $processname` + if [ $pidofdlt ] + then + echo "DLT Deamon is running with PID:$pidofdlt" + else + echo "DLT Daemon is NOT running" + fi + + if [ -f /var/log/messages ] + then + echo "------- messages ----------------" + cat /var/log/messages | grep -a DLT | tail + fi + + if [ -f /var/log/syslog ] + then + echo "------- SYSLOG -------------------" + cat /var/log/syslog | grep -a DLT | tail + fi + RETVAL=$? + ;; + *) + echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" + ;; +esac + +exit $RETVAL diff --git a/testscripts/Ubuntu/dlt-daemon.cmake b/testscripts/Ubuntu/dlt-daemon.cmake new file mode 100755 index 0000000..e7ef098 --- /dev/null +++ b/testscripts/Ubuntu/dlt-daemon.cmake @@ -0,0 +1,172 @@ +#!/bin/sh +### BEGIN INIT INFO +# Provides: dlt-daemon +# Required-Start: $network $local_fs +# Required-Stop: +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: +# Description: +# <...> +# <...> +### END INIT INFO + +# Author: root + +# PATH should only include /usr/* if it runs after the mountnfs.sh script +PATH=/sbin:/usr/sbin:/bin:/usr/bin +DESC=dlt-daemon # Introduce a short description here +NAME=dlt-daemon # Introduce the short server's name here +DAEMON=@CMAKE_INSTALL_PREFIX@/bin/dlt-daemon # Introduce the server's location here +DAEMON_ARGS="-d" # Arguments to run the daemon with +PIDFILE=/var/run/$NAME.pid +SCRIPTNAME=/etc/init.d/$NAME + +# Exit if the package is not installed +[ -x $DAEMON ] || exit 0 + +# Read configuration variable file if it is present +[ -r /etc/default/$NAME ] && . /etc/default/$NAME + +# Load the VERBOSE setting and other rcS variables +. /lib/init/vars.sh + +# Define LSB log_* functions. +# Depend on lsb-base (>= 3.0-6) to ensure that this file is present. +. /lib/lsb/init-functions + +# +# Function that starts the daemon/service +# +do_start() +{ + # Return + # 0 if daemon has been started + # 1 if daemon was already running + # 2 if daemon could not be started + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON --test > /dev/null \ + || return 1 + start-stop-daemon --start --quiet --pidfile $PIDFILE --exec $DAEMON -- \ + $DAEMON_ARGS \ + || return 2 + # Add code here, if necessary, that waits for the process to be ready + # to handle requests from services started subsequently which depend + # on this one. As a last resort, sleep for some time. +} + +# +# Function that stops the daemon/service +# +do_stop() +{ + # Return + # 0 if daemon has been stopped + # 1 if daemon was already stopped + # 2 if daemon could not be stopped + # other if a failure occurred + start-stop-daemon --stop --quiet --retry=TERM/30/KILL/5 --pidfile $PIDFILE --name $NAME + RETVAL="$?" + [ "$RETVAL" = 2 ] && return 2 + # Wait for children to finish too if this is a daemon that forks + # and if the daemon is only ever run from this initscript. + # If the above conditions are not satisfied then add some other code + # that waits for the process to drop all resources that could be + # needed by services started subsequently. A last resort is to + # sleep for some time. + start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON + [ "$?" = 2 ] && return 2 + # Many daemons don't delete their pidfiles when they exit. + rm -f $PIDFILE + return "$RETVAL" +} + +# +# Function that sends a SIGHUP to the daemon/service +# +do_reload() { + # + # If the daemon can reload its configuration without + # restarting (for example, when it is sent a SIGHUP), + # then implement that here. + # + start-stop-daemon --stop --signal 1 --quiet --pidfile $PIDFILE --name $NAME + return 0 +} + +case "$1" in + start) + [ "$VERBOSE" != no ] && log_daemon_msg "Starting $DESC " "$NAME" + do_start + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + stop) + [ "$VERBOSE" != no ] && log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + case "$?" in + 0|1) [ "$VERBOSE" != no ] && log_end_msg 0 ;; + 2) [ "$VERBOSE" != no ] && log_end_msg 1 ;; + esac + ;; + status) + if [ -f /var/log/messages ] + then + log_daemon_msg "------- messages ----------------" + cat /var/log/messages | grep -a DLT | tail + fi + + if [ -f /var/log/syslog ] + then + log_daemon_msg "------- SYSLOG -------------------" + cat /var/log/syslog | grep -a DLT | tail + fi + + status_of_proc "$DAEMON" "$NAME" || exit $? + + pidofdlt=`pidof $DESC` + if [ $pidofdlt ] + then + log_daemon_msg "$NAME has the PID:$pidofdlt" + fi + + + ;; + #reload|force-reload) + # + # If do_reload() is not implemented then leave this commented out + # and leave 'force-reload' as an alias for 'restart'. + # + #log_daemon_msg "Reloading $DESC" "$NAME" + #do_reload + #log_end_msg $? + #;; + restart|force-reload) + # + # If the "reload" option is implemented then remove the + # 'force-reload' alias + # + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + case "$?" in + 0|1) + do_start + case "$?" in + 0) log_end_msg 0 ;; + 1) log_end_msg 1 ;; # Old process is still running + *) log_end_msg 1 ;; # Failed to start + esac + ;; + *) + # Failed to stop + log_end_msg 1 + ;; + esac + ;; + *) + #echo "Usage: $SCRIPTNAME {start|stop|restart|reload|force-reload}" >&2 + echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2 + exit 3 + ;; +esac diff --git a/testscripts/dltdaemon b/testscripts/dltdaemon deleted file mode 100755 index baf3b8e..0000000 --- a/testscripts/dltdaemon +++ /dev/null @@ -1,64 +0,0 @@ -#!/bin/sh -# -# Starts the DLT Daemon -# -# chkconfig: 2345 21 87 -# description: Provides DLT Debug Logging & Trace functionality -# processname: dlt-daemon - -# Source function library. -. /etc/rc.d/init.d/functions - - -processname=dlt-daemon -processpath=/usr/bin -servicename=dlt-daemon - - -[ -x $processpath ] || exit 0 - -start() { - echo -n $"Starting $processname daemon: " - /usr/bin/dlt-daemon -d -} - -stop() { - echo -n $"Stopping $processname daemon: " - killproc $servicename -TERM - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/$servicename -} - -RETVAL=0 - -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart) - stop - start - ;; - condrestart) - if [ -f /var/lock/subsys/$servicename ]; then - stop - start - fi - ;; - reload) - restart - ;; - status) - status $processname - RETVAL=$? - ;; - *) - echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}" - ;; -esac - -exit $RETVAL diff --git a/testscripts/dltinfo.sh b/testscripts/dltinfo.sh deleted file mode 100755 index 3e70ab5..0000000 --- a/testscripts/dltinfo.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh -clear -processname="dlt-daemon" -pidofdlt=`pidof $processname` - -if [ $pidofdlt ] - then - echo "DLT Deamon is running with PID:$pidofdlt" - else - echo "DLT Daemon is NOT running" -fi - -if [ -f /var/log/messages ] - then -echo "------- messages ----------------" -cat /var/log/messages | grep -a DLT | tail -fi - -if [ -f /var/log/syslog ] - then - echo "------- SYSLOG -------------------" - cat /var/log/syslog | grep -a DLT | tail -fi - diff --git a/transform_spec_file.py b/transform_spec_file.py deleted file mode 100755 index b474e6b..0000000 --- a/transform_spec_file.py +++ /dev/null @@ -1,11 +0,0 @@ -import sys -from Cheetah.Template import Template - -output = sys.argv[2] -args = {} -for arg in sys.argv[3:]: - key, value = arg.split('=') - args[key] = value -t = Template(file=sys.argv[1], searchList=[args]) -with open(output, 'w') as f: - f.write(str(t)) -- cgit v1.2.1