From patchwork Wed Apr  7 22:08:10 2010
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Pavel Roskin <proski@gnu.org>
X-Patchwork-Id: 91177
Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
	by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o37M8D7O031316
	for <patchwork-linux-wireless@patchwork.kernel.org>;
	Wed, 7 Apr 2010 22:08:13 GMT
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1755945Ab0DGWIM (ORCPT
	<rfc822;patchwork-linux-wireless@patchwork.kernel.org>);
	Wed, 7 Apr 2010 18:08:12 -0400
Received: from c60.cesmail.net ([216.154.195.49]:42488 "EHLO c60.cesmail.net"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1754398Ab0DGWIL (ORCPT <rfc822; linux-wireless@vger.kernel.org>);
	Wed, 7 Apr 2010 18:08:11 -0400
Received: from unknown (HELO smtprelay2.cesmail.net) ([192.168.1.112])
	by c60.cesmail.net with ESMTP; 07 Apr 2010 18:08:12 -0400
Received: from mj.roinet.com (static-72-92-88-10.phlapa.fios.verizon.net
	[72.92.88.10])
	by smtprelay2.cesmail.net (Postfix) with ESMTPSA id BA00D34C6A;
	Wed,  7 Apr 2010 18:12:46 -0400 (EDT)
Subject: [PATCH] compat-wireless: fix fallbacks for unknown branch,
	remote or remote URL
To: "Luis R. Rodriguez" <mcgrof@gmail.com>, linux-wireless@vger.kernel.org
From: Pavel Roskin <proski@gnu.org>
Date: Wed, 07 Apr 2010 18:08:10 -0400
Message-ID: <20100407220810.14021.54998.stgit@mj.roinet.com>
User-Agent: StGit/0.15-58-geec5
MIME-Version: 1.0
Sender: linux-wireless-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-wireless.vger.kernel.org>
X-Mailing-List: linux-wireless@vger.kernel.org
X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by
	milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]);
	Wed, 07 Apr 2010 22:08:13 +0000 (UTC)


diff --git a/scripts/admin-update.sh b/scripts/admin-update.sh
index 5d8068d..36cdfac 100755
--- a/scripts/admin-update.sh
+++ b/scripts/admin-update.sh
@@ -296,11 +296,11 @@ DIR="$PWD"
 cd $GIT_TREE
 GIT_DESCRIBE=$(git describe)
 GIT_BRANCH=$(git branch --no-color |sed -n 's/^\* //p')
-GIT_BRANCH=${GIT_BRANCH-master}
+GIT_BRANCH=${GIT_BRANCH:-master}
 GIT_REMOTE=$(git config branch.${GIT_BRANCH}.remote)
-GIT_REMOTE=${GIT_REMOTE-origin}
+GIT_REMOTE=${GIT_REMOTE:-origin}
 GIT_REMOTE_URL=$(git config remote.${GIT_REMOTE}.url)
-GIT_REMOTE_URL=${GIT_REMOTE_URL-unknown}
+GIT_REMOTE_URL=${GIT_REMOTE_URL:-unknown}
 echo -e "${GREEN}Updated${NORMAL} from local tree: ${BLUE}${GIT_TREE}${NORMAL}"
 echo -e "Origin remote URL: ${CYAN}${GIT_REMOTE_URL}${NORMAL}"
 cd $DIR