From owner-svn-ports-all@FreeBSD.ORG Sat Jun 13 12:21:52 2015 Return-Path: Delivered-To: svn-ports-all@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C055CC13; Sat, 13 Jun 2015 12:21:52 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ADE7C106; Sat, 13 Jun 2015 12:21:52 +0000 (UTC) (envelope-from jlh@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5DCLqf7002835; Sat, 13 Jun 2015 12:21:52 GMT (envelope-from jlh@FreeBSD.org) Received: (from jlh@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5DCLqxV002833; Sat, 13 Jun 2015 12:21:52 GMT (envelope-from jlh@FreeBSD.org) Message-Id: <201506131221.t5DCLqxV002833@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: jlh set sender to jlh@FreeBSD.org using -f From: Jeremie Le Hen Date: Sat, 13 Jun 2015 12:21:52 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389352 - in head/www: madsonic-standalone/files subsonic-standalone/files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Jun 2015 12:21:52 -0000 Author: jlh (src committer) Date: Sat Jun 13 12:21:51 2015 New Revision: 389352 URL: https://svnweb.freebsd.org/changeset/ports/389352 Log: Fix and simplify startup script so it works on boot. Approved by: madpilot Modified: head/www/madsonic-standalone/files/madsonic.in head/www/subsonic-standalone/files/subsonic.in Modified: head/www/madsonic-standalone/files/madsonic.in ============================================================================== --- head/www/madsonic-standalone/files/madsonic.in Sat Jun 13 11:52:51 2015 (r389351) +++ head/www/madsonic-standalone/files/madsonic.in Sat Jun 13 12:21:51 2015 (r389352) @@ -51,18 +51,7 @@ . /etc/rc.subr -case $0 in -/etc/rc*) - # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), - # so get the name of the script from $_file - name=$_file - ;; -*) - name=$0 - ;; -esac - -name=${0##*/} +name=madsonic rcvar=${name}_enable procname="%%JAVA%%" Modified: head/www/subsonic-standalone/files/subsonic.in ============================================================================== --- head/www/subsonic-standalone/files/subsonic.in Sat Jun 13 11:52:51 2015 (r389351) +++ head/www/subsonic-standalone/files/subsonic.in Sat Jun 13 12:21:51 2015 (r389352) @@ -47,18 +47,7 @@ . /etc/rc.subr -case $0 in -/etc/rc*) - # during boot (shutdown) $0 is /etc/rc (/etc/rc.shutdown), - # so get the name of the script from $_file - name=$_file - ;; -*) - name=$0 - ;; -esac - -name=${0##*/} +name=subsonic rcvar=${name}_enable procname="%%JAVA%%"