Date: Mon, 17 Oct 2016 04:00:21 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r424092 - in head: cad/brlcad/files devel/hadoop/files games/childsplay games/stepmania-devel japanese/mozc-server java/eclipse/files java/intellij-pycharm/files java/intellij-ultimate/... Message-ID: <201610170400.u9H40L9U029390@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Oct 17 04:00:20 2016 New Revision: 424092 URL: https://svnweb.freebsd.org/changeset/ports/424092 Log: - Double-quote $@ to properly propagate parameters down the execution path - Consistently pad (separate) shebang in wrapper scripts with an empty line Modified: head/cad/brlcad/files/mged.sh head/devel/hadoop/files/hadoop.in head/games/childsplay/Makefile head/games/stepmania-devel/Makefile head/japanese/mozc-server/Makefile head/java/eclipse/files/eclipse.in head/java/intellij-pycharm/files/pycharm.in head/java/intellij-ultimate/files/idea.in head/java/intellij/files/idea.in head/java/jd-gui/files/jd-gui.in head/news/papercut/files/papercut-wrapper head/sysutils/namefix/Makefile head/www/dojo-shrinksafe/files/dojo-shrinksafe.in head/www/htmlcompressor/files/htmlcompressor.in head/www/scloader/files/scloader.sh head/www/xombrero/files/xombrero.in head/www/yuicompressor/files/yuicompressor.in Modified: head/cad/brlcad/files/mged.sh ============================================================================== --- head/cad/brlcad/files/mged.sh Mon Oct 17 03:05:55 2016 (r424091) +++ head/cad/brlcad/files/mged.sh Mon Oct 17 04:00:20 2016 (r424092) @@ -10,4 +10,4 @@ export MANPATH=%%BRLCAD_ROOT%%/man:$MANP 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 "$@" Modified: head/devel/hadoop/files/hadoop.in ============================================================================== --- head/devel/hadoop/files/hadoop.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/devel/hadoop/files/hadoop.in Mon Oct 17 04:00:20 2016 (r424092) @@ -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 "$@" Modified: head/games/childsplay/Makefile ============================================================================== --- head/games/childsplay/Makefile Mon Oct 17 03:05:55 2016 (r424091) +++ head/games/childsplay/Makefile Mon Oct 17 04:00:20 2016 (r424092) @@ -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}/;;}) Modified: head/games/stepmania-devel/Makefile ============================================================================== --- head/games/stepmania-devel/Makefile Mon Oct 17 03:05:55 2016 (r424091) +++ head/games/stepmania-devel/Makefile Mon Oct 17 04:00:20 2016 (r424092) @@ -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: Modified: head/japanese/mozc-server/Makefile ============================================================================== --- head/japanese/mozc-server/Makefile Mon Oct 17 03:05:55 2016 (r424091) +++ head/japanese/mozc-server/Makefile Mon Oct 17 04:00:20 2016 (r424092) @@ -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 Modified: head/java/eclipse/files/eclipse.in ============================================================================== --- head/java/eclipse/files/eclipse.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/java/eclipse/files/eclipse.in Mon Oct 17 04:00:20 2016 (r424092) @@ -43,4 +43,4 @@ if [ ! -x "${ECLIPSE_HOME}/eclipse" ]; t 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" "$@" Modified: head/java/intellij-pycharm/files/pycharm.in ============================================================================== --- head/java/intellij-pycharm/files/pycharm.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/java/intellij-pycharm/files/pycharm.in Mon Oct 17 04:00:20 2016 (r424092) @@ -1,2 +1,3 @@ #!/bin/sh -exec "%%DATADIR%%/bin/pycharm.sh" $@ + +exec "%%DATADIR%%/bin/pycharm.sh" "$@" Modified: head/java/intellij-ultimate/files/idea.in ============================================================================== --- head/java/intellij-ultimate/files/idea.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/java/intellij-ultimate/files/idea.in Mon Oct 17 04:00:20 2016 (r424092) @@ -1,2 +1,3 @@ #!/bin/sh -exec "%%IDEA_HOME%%/bin/idea.sh" $@ + +exec "%%IDEA_HOME%%/bin/idea.sh" "$@" Modified: head/java/intellij/files/idea.in ============================================================================== --- head/java/intellij/files/idea.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/java/intellij/files/idea.in Mon Oct 17 04:00:20 2016 (r424092) @@ -1,2 +1,3 @@ #!/bin/sh -exec "%%IDEA_HOME%%/bin/idea.sh" $@ + +exec "%%IDEA_HOME%%/bin/idea.sh" "$@" Modified: head/java/jd-gui/files/jd-gui.in ============================================================================== --- head/java/jd-gui/files/jd-gui.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/java/jd-gui/files/jd-gui.in Mon Oct 17 04:00:20 2016 (r424092) @@ -1,2 +1,3 @@ #!/bin/sh -exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" $@ + +exec java -jar "%%JAVAJARDIR%%/jd-gui.jar" "$@" Modified: head/news/papercut/files/papercut-wrapper ============================================================================== --- head/news/papercut/files/papercut-wrapper Mon Oct 17 03:05:55 2016 (r424091) +++ head/news/papercut/files/papercut-wrapper Mon Oct 17 04:00:20 2016 (r424092) @@ -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 "$@" Modified: head/sysutils/namefix/Makefile ============================================================================== --- head/sysutils/namefix/Makefile Mon Oct 17 03:05:55 2016 (r424091) +++ head/sysutils/namefix/Makefile Mon Oct 17 04:00:20 2016 (r424092) @@ -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 Modified: head/www/dojo-shrinksafe/files/dojo-shrinksafe.in ============================================================================== --- head/www/dojo-shrinksafe/files/dojo-shrinksafe.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/www/dojo-shrinksafe/files/dojo-shrinksafe.in Mon Oct 17 04:00:20 2016 (r424092) @@ -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 "$@" Modified: head/www/htmlcompressor/files/htmlcompressor.in ============================================================================== --- head/www/htmlcompressor/files/htmlcompressor.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/www/htmlcompressor/files/htmlcompressor.in Mon Oct 17 04:00:20 2016 (r424092) @@ -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 "$@" Modified: head/www/scloader/files/scloader.sh ============================================================================== --- head/www/scloader/files/scloader.sh Mon Oct 17 03:05:55 2016 (r424091) +++ head/www/scloader/files/scloader.sh Mon Oct 17 04:00:20 2016 (r424092) @@ -1,3 +1,3 @@ #! /bin/sh -exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" $@ +exec "%%JAVA%%" -mx512m -jar "%%JAVAJARDIR%%/scloader.jar" "$@" Modified: head/www/xombrero/files/xombrero.in ============================================================================== --- head/www/xombrero/files/xombrero.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/www/xombrero/files/xombrero.in Mon Oct 17 04:00:20 2016 (r424092) @@ -19,4 +19,4 @@ if [ -f "%%EXAMPLESDIR%%/playflash.sh" ] chmod +x $HOME/.xombrero/playflash.sh fi -exec %%PREFIX%%/bin/xombrero-bin $@ +exec %%PREFIX%%/bin/xombrero-bin "$@" Modified: head/www/yuicompressor/files/yuicompressor.in ============================================================================== --- head/www/yuicompressor/files/yuicompressor.in Mon Oct 17 03:05:55 2016 (r424091) +++ head/www/yuicompressor/files/yuicompressor.in Mon Oct 17 04:00:20 2016 (r424092) @@ -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 "$@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610170400.u9H40L9U029390>