From owner-svn-ports-head@FreeBSD.ORG  Wed Aug 29 09:53:59 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8C530106566C;
	Wed, 29 Aug 2012 09:53:59 +0000 (UTC)
	(envelope-from zeising@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 76ED48FC19;
	Wed, 29 Aug 2012 09:53:59 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q7T9rx9O022789;
	Wed, 29 Aug 2012 09:53:59 GMT (envelope-from zeising@svn.freebsd.org)
Received: (from zeising@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q7T9rxZO022787;
	Wed, 29 Aug 2012 09:53:59 GMT (envelope-from zeising@svn.freebsd.org)
Message-Id: <201208290953.q7T9rxZO022787@svn.freebsd.org>
From: Niclas Zeising <zeising@FreeBSD.org>
Date: Wed, 29 Aug 2012 09:53:59 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
	svn-ports-head@freebsd.org
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r303327 - head/www/xombrero/files
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the ports tree for head
	<svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>, 
	<mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
	<mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Aug 2012 09:53:59 -0000

Author: zeising
Date: Wed Aug 29 09:53:58 2012
New Revision: 303327
URL: http://svn.freebsd.org/changeset/ports/303327

Log:
  Fix the startup script to not overwrite configuration files and accept
  program arguments
  
  PR:		ports/171140, ports/171141
  Submitted by:	kaltheat <kaltheat@gmail.com> (pr), me (patch)
  Approved by:	miwi (mentor)

Modified:
  head/www/xombrero/files/xombrero.in

Modified: head/www/xombrero/files/xombrero.in
==============================================================================
--- head/www/xombrero/files/xombrero.in	Wed Aug 29 09:44:53 2012	(r303326)
+++ head/www/xombrero/files/xombrero.in	Wed Aug 29 09:53:58 2012	(r303327)
@@ -5,18 +5,18 @@
 # A wrapper script for xombrero
 # Created by HU Dong <itechbear@gmail.com>
 
-if [ ! -d "~/.xombrero" ]; then
-	mkdir -p -m 700 ~/.xombrero
+if [ ! -d "$HOME/.xombrero" ]; then
+	mkdir -p -m 700 $HOME/.xombrero
 fi
 
-if [ ! -f "~/.xombrero.conf" ]; then
-	cp %%EXAMPLESDIR%%/xombrero.conf ~/.xombrero.conf
-	chmod +w ~/.xombrero.conf
+if [ ! -f "$HOME/.xombrero.conf" ]; then
+	cp %%EXAMPLESDIR%%/xombrero.conf $HOME/.xombrero.conf
+	chmod +w $HOME/.xombrero.conf
 fi
 
-if [ ! -f "~/.xombrero/playflash.sh" ]; then
-	cp %%EXAMPLESDIR%%/playflash.sh ~/.xombrero/playflash.sh
-	chmod +x ~/.xombrero/playflash.sh
+if [ ! -f "$HOME/.xombrero/playflash.sh" ]; then
+	cp %%EXAMPLESDIR%%/playflash.sh $HOME/.xombrero/playflash.sh
+	chmod +x $HOME/.xombrero/playflash.sh
 fi
 
-exec %%PREFIX%%/bin/xombrero-bin
+exec %%PREFIX%%/bin/xombrero-bin $@