From bbc0e7b3768fd407bc6823461ac9cb1e90fe2785 Mon Sep 17 00:00:00 2001 From: Alexey Dokuchaev Date: Mon, 17 Oct 2016 04:00:20 +0000 Subject: [PATCH] - Double-quote $@ to properly propagate parameters down the execution path - Consistently pad (separate) shebang in wrapper scripts with an empty line --- cad/brlcad/files/mged.sh | 2 +- devel/hadoop/files/hadoop.in | 3 ++- games/childsplay/Makefile | 7 ++++--- games/stepmania-devel/Makefile | 2 +- japanese/mozc-server/Makefile | 2 +- java/eclipse/files/eclipse.in | 2 +- java/intellij-pycharm/files/pycharm.in | 3 ++- java/intellij-ultimate/files/idea.in | 3 ++- java/intellij/files/idea.in | 3 ++- java/jd-gui/files/jd-gui.in | 3 ++- news/papercut/files/papercut-wrapper | 3 +-- sysutils/namefix/Makefile | 3 ++- www/dojo-shrinksafe/files/dojo-shrinksafe.in | 3 ++- www/htmlcompressor/files/htmlcompressor.in | 3 ++- www/scloader/files/scloader.sh | 2 +- www/xombrero/files/xombrero.in | 2 +- www/yuicompressor/files/yuicompressor.in | 3 ++- 17 files changed, 29 insertions(+), 20 deletions(-) diff --git a/cad/brlcad/files/mged.sh b/cad/brlcad/files/mged.sh index d819c2bb7301..02e3646ce752 100644 --- a/cad/brlcad/files/mged.sh +++ b/cad/brlcad/files/mged.sh @@ -10,4 +10,4 @@ export MANPATH=%%BRLCAD_ROOT%%/man:$MANPATH export ITCL_PATH=%%BRLCAD_ROOT%%/lib/itcl3.4 export ITK_PATH=%%BRLCAD_ROOT%%/lib/itk3.4 -exec %%BRLCAD_ROOT%%/bin/mged $@ +exec %%BRLCAD_ROOT%%/bin/mged "$@" diff --git a/devel/hadoop/files/hadoop.in b/devel/hadoop/files/hadoop.in index 69b152c74e6c..53dda95393be 100644 --- a/devel/hadoop/files/hadoop.in +++ b/devel/hadoop/files/hadoop.in @@ -1,7 +1,8 @@ #!/usr/bin/env bash + for i in `ls %%ETCDIR%%/envvars.d/*.env` do . ${i} done -exec %%DATADIR%%/bin/hadoop $@ +exec %%DATADIR%%/bin/hadoop "$@" diff --git a/games/childsplay/Makefile b/games/childsplay/Makefile index b64c2657f95f..f2bf72bb8859 100644 --- a/games/childsplay/Makefile +++ b/games/childsplay/Makefile @@ -41,17 +41,18 @@ do-configure: @${ECHO_CMD} "#!${SH}" > ${WRKDIR}/childsplay.sh @${ECHO_CMD} >> ${WRKDIR}/childsplay.sh @${ECHO_CMD} 'cd "${CHILDSPLAYDIR}"' >> ${WRKDIR}/childsplay.sh - @${ECHO_CMD} 'exec ${PYTHON_CMD} childsplay.py $$@' >> ${WRKDIR}/childsplay.sh + @${ECHO_CMD} 'exec ${PYTHON_CMD} childsplay.py "$$@"' \ + >> ${WRKDIR}/childsplay.sh do-install: - ${INSTALL_SCRIPT} ${WRKDIR}/childsplay.sh ${STAGEDIR}${PREFIX}/bin/childsplay + ${INSTALL_SCRIPT} ${WRKDIR}/childsplay.sh \ + ${STAGEDIR}${PREFIX}/bin/childsplay @${MKDIR} ${STAGEDIR}${CHILDSPLAYDIR} ${INSTALL_DATA} ${WRKSRC}/*.py ${STAGEDIR}${CHILDSPLAYDIR} (cd ${WRKSRC} && ${COPYTREE_SHARE} "SPWidgets alphabetsounds lib" \ ${STAGEDIR}${CHILDSPLAYDIR}) (cd ${WRKSRC} && ${COPYTREE_SHARE} locale ${STAGEDIR}${PREFIX}/share) ${INSTALL_DATA} ${WRKSRC}/sp_content.db ${STAGEDIR}${CHILDSPLAYDIR} - (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -m compileall \ -d ${PREFIX} -f ${PYTHONPREFIX_SITELIBDIR:S;${PREFIX}/;;}) diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile index 19fe88762ce7..53e22239db1c 100644 --- a/games/stepmania-devel/Makefile +++ b/games/stepmania-devel/Makefile @@ -61,7 +61,7 @@ pre-build: >> ${WRKDIR}/wrappers/stepmania @${ECHO_CMD} 'cd ${PREFIX}/lib/stepmania' \ >> ${WRKDIR}/wrappers/stepmania - @${ECHO_CMD} 'exec ./stepmania $$@' \ + @${ECHO_CMD} 'exec ./stepmania "$$@"' \ >> ${WRKDIR}/wrappers/stepmania do-install: diff --git a/japanese/mozc-server/Makefile b/japanese/mozc-server/Makefile index 10603c114399..ea0173421a6e 100644 --- a/japanese/mozc-server/Makefile +++ b/japanese/mozc-server/Makefile @@ -110,7 +110,7 @@ post-patch: .if !${BUILD_MOZC_LIST:Mmozc_el} ${BUILD_WRKSRC}/mozcmake: - ${PRINTF} "%s\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} $$@' \ + ${PRINTF} "%s\n\n%s\n" "#!/bin/sh" 'exec ${BUILD_CMD} "$$@"' \ > ${BUILD_WRKSRC}/mozcmake ${CHMOD} +x ${BUILD_WRKSRC}/mozcmake diff --git a/java/eclipse/files/eclipse.in b/java/eclipse/files/eclipse.in index f3c54f4c6d70..10505f2270e7 100644 --- a/java/eclipse/files/eclipse.in +++ b/java/eclipse/files/eclipse.in @@ -43,4 +43,4 @@ if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; then exit 1 fi -JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} %%SWTGTK3OPT%% exec "${ECLIPSE_HOME}/eclipse" $@ +JAVA_VERSION="%%JAVA_VERSION%%" JAVA_OS="%%JAVA_OS%%" PATH=${JAVA_HOME}/bin:${PATH} %%SWTGTK3OPT%% exec "${ECLIPSE_HOME}/eclipse" "$@" diff --git a/java/intellij-pycharm/files/pycharm.in b/java/intellij-pycharm/files/pycharm.in index 1a490905044c..d0f462e88036 100644 --- a/java/intellij-pycharm/files/pycharm.in +++ b/java/intellij-pycharm/files/pycharm.in @@ -1,2 +1,3 @@ #!/bin/sh -exec "%%DATADIR%%/bin/pycharm.sh" $@ + +exec "%%DATADIR%%/bin/pycharm.sh" "$@" diff --git a/java/intellij-ultimate/files/idea.in b/java/intellij-ultimate/files/idea.in index b4ba5da0e1a1..0b0ad81de31c 100644 --- a/java/intellij-ultimate/files/idea.in +++ b/java/intellij-ultimate/files/idea.in @@ -1,2 +1,3 @@ #!/bin/sh -exec "%%IDEA_HOME%%/bin/idea.sh" $@ + +exec "%%IDEA_HOME%%/bin/idea.sh" "$@" diff --git a/java/intellij/files/idea.in b/java/intellij/files/idea.in index b4ba5da0e1a1..0b0ad81de31c 100644 --- a/java/intellij/files/idea.in +++ b/java/intellij/files/idea.in @@ -1,2 +1,3 @@ #!/bin/sh -exec "%%IDEA_HOME%%/bin/idea.sh" $@ + +exec "%%IDEA_HOME%%/bin/idea.sh" "$@" diff --git a/java/jd-gui/files/jd-gui.in b/java/jd-gui/files/jd-gui.in index f1e2d1bd4280..981ed420de54 100644 --- a/java/jd-gui/files/jd-gui.in +++ b/java/jd-gui/files/jd-gui.in @@ -1,2 +1,3 @@ #!/bin/sh -exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" $@ + +exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" "$@" diff --git a/news/papercut/files/papercut-wrapper b/news/papercut/files/papercut-wrapper index b9aa1db56963..51ca9df5e4ac 100644 --- a/news/papercut/files/papercut-wrapper +++ b/news/papercut/files/papercut-wrapper @@ -9,5 +9,4 @@ export PYTHONPATH # You can change this to point to your Python interpreter if you wish. PYTHON=__PYTHON__ -exec "$PYTHON" ${PPCPATH}/papercut.py $@ - +exec "$PYTHON" ${PPCPATH}/papercut.py "$@" diff --git a/sysutils/namefix/Makefile b/sysutils/namefix/Makefile index 49479950e508..86bdfa877a23 100644 --- a/sysutils/namefix/Makefile +++ b/sysutils/namefix/Makefile @@ -29,9 +29,10 @@ SHEBANG_FILES= namefix-cli.pl namefix.pl do-configure: .for bin in ${PORTNAME} ${PORTNAME}-cli @${ECHO_CMD} '#!/bin/sh' > ${WRKDIR}/${bin}.in + @${ECHO_CMD} >> ${WRKDIR}/${bin}.in @${ECHO_CMD} 'namefix_dir=${PREFIX}/${SITE_PERL_REL}/${PORTNAME}' \ >> ${WRKDIR}/${bin}.in - @${ECHO_CMD} 'cd $${namefix_dir}; exec ./${bin}.pl $$@' \ + @${ECHO_CMD} 'cd $${namefix_dir} && exec ./${bin}.pl "$$@"' \ >> ${WRKDIR}/${bin}.in .endfor diff --git a/www/dojo-shrinksafe/files/dojo-shrinksafe.in b/www/dojo-shrinksafe/files/dojo-shrinksafe.in index 100b748fae1e..050e6bd0de7b 100644 --- a/www/dojo-shrinksafe/files/dojo-shrinksafe.in +++ b/www/dojo-shrinksafe/files/dojo-shrinksafe.in @@ -1,2 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar $@ + +JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -classpath %%DATADIR%%/js.jar -jar %%DATADIR%%/shrinksafe.jar "$@" diff --git a/www/htmlcompressor/files/htmlcompressor.in b/www/htmlcompressor/files/htmlcompressor.in index fd2e5eda0a3b..51762b6a44a9 100644 --- a/www/htmlcompressor/files/htmlcompressor.in +++ b/www/htmlcompressor/files/htmlcompressor.in @@ -1,3 +1,4 @@ #!/bin/sh # $FreeBSD$ -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar $@ + +JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/htmlcompressor.jar "$@" diff --git a/www/scloader/files/scloader.sh b/www/scloader/files/scloader.sh index 1fbeb0dc2abd..b73ca570f68b 100644 --- a/www/scloader/files/scloader.sh +++ b/www/scloader/files/scloader.sh @@ -1,3 +1,3 @@ #! /bin/sh -exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" $@ +exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" "$@" diff --git a/www/xombrero/files/xombrero.in b/www/xombrero/files/xombrero.in index 6334da746a58..11674be1e329 100644 --- a/www/xombrero/files/xombrero.in +++ b/www/xombrero/files/xombrero.in @@ -19,4 +19,4 @@ if [ -f "%%EXAMPLESDIR%%/playflash.sh" ] && [ ! -f "$HOME/.xombrero/playflash.sh chmod +x $HOME/.xombrero/playflash.sh fi -exec %%PREFIX%%/bin/xombrero-bin $@ +exec %%PREFIX%%/bin/xombrero-bin "$@" diff --git a/www/yuicompressor/files/yuicompressor.in b/www/yuicompressor/files/yuicompressor.in index 20e4b11bb46c..6e09f807e5d7 100644 --- a/www/yuicompressor/files/yuicompressor.in +++ b/www/yuicompressor/files/yuicompressor.in @@ -1,2 +1,3 @@ #!/bin/sh -JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar $@ + +JAVA_VERSION="%%JAVA_VERSION%%" exec %%LOCALBASE%%/bin/java -jar %%JAVAJARDIR%%/yuicompressor.jar "$@"