diff options
| -rw-r--r-- | eclass/rox.eclass | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/eclass/rox.eclass b/eclass/rox.eclass index 0b5cc50..1df348e 100644 --- a/eclass/rox.eclass +++ b/eclass/rox.eclass @@ -23,6 +23,7 @@ # WRAPPERNAME - the name of the wrapper installed into /usr/bin # Defaults to 'rox-${PN}', or just ${PN} if it already starts with 'rox'. # This does not normally need to be overridden. +# If overridden with the reserved word 'skip' no wrapper will be created. # APPNAME_COLLISION - If not set, the old naming convention for wrappers of # /usr/bin/${APPNAME} will still be around. Needs only be set in packages # with known collisions (such as Pager, which collides with afterstep) @@ -190,9 +191,10 @@ rox_src_install() { # all be preserved. cp -pPR ${APPNAME} ${D}${APPDIR}/${APPNAME} - #create a script in bin to run the application from command line - dodir /usr/bin/ - cat >"${D}/usr/bin/${WRAPPERNAME}" <<EOF + if [[ "${WRAPPERNAME}" != "skip" ]]; then + #create a script in bin to run the application from command line + dodir /usr/bin/ + cat >"${D}/usr/bin/${WRAPPERNAME}" <<EOF #!/bin/sh if [[ "\${LIBDIRPATH}" ]]; then export LIBDIRPATH="\${LIBDIRPATH}:${LIBDIR}" @@ -207,16 +209,17 @@ else fi exec "${APPDIR}/${APPNAME}/AppRun" "\$@" EOF - chmod 755 "${D}/usr/bin/${WRAPPERNAME}" + chmod 755 "${D}/usr/bin/${WRAPPERNAME}" - # Old name of cmdline wrapper: /usr/bin/${APPNAME} - if [[ ! "${APPNAME_COLLISION}" ]]; then - ln -s ${WRAPPERNAME} ${D}/usr/bin/${APPNAME} - # TODO: Migrate this away... eventually - else - ewarn "The wrapper script /usr/bin/${APPNAME} has been removed" - ewarn "due to a name collision. You must run ${APPNAME} as" - ewarn "/usr/bin/${WRAPPERNAME} instead." + # Old name of cmdline wrapper: /usr/bin/${APPNAME} + if [[ ! "${APPNAME_COLLISION}" ]]; then + ln -s ${WRAPPERNAME} ${D}/usr/bin/${APPNAME} + # TODO: Migrate this away... eventually + else + ewarn "The wrapper script /usr/bin/${APPNAME} has been removed" + ewarn "due to a name collision. You must run ${APPNAME} as" + ewarn "/usr/bin/${WRAPPERNAME} instead." + fi fi # Create a .desktop file if the proper category is supplied @@ -273,8 +276,12 @@ EOF rox_pkg_postinst() { einfo "${APPNAME} has been installed into ${APPDIR}" - einfo "You can run it by typing ${WRAPPERNAME} at the command line." - einfo "Or, you can run it by pointing the ROX file manager to the" + if [[ "${WRAPPERNAME}" != "skip" ]]; then + einfo "You can run it by typing ${WRAPPERNAME} at the command line." + einfo "Or, you can run it by pointing the ROX file manager to the" + else + einfo "You can run it by pointing the ROX file manager to the" + fi einfo "install location -- ${APPDIR} -- and click" einfo "on ${APPNAME}'s icon, drag it to a panel, desktop, etc." } |