From patchwork Tue Mar 21 10:14:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jani Nikula X-Patchwork-Id: 9636337 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 0F2056020B for ; Tue, 21 Mar 2017 10:14:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0A71E27B13 for ; Tue, 21 Mar 2017 10:14:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F37B227D8D; Tue, 21 Mar 2017 10:14:51 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B22BF27B13 for ; Tue, 21 Mar 2017 10:14:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 549216E32F; Tue, 21 Mar 2017 10:14:51 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTPS id 262006E32F for ; Tue, 21 Mar 2017 10:14:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=intel.com; i=@intel.com; q=dns/txt; s=intel; t=1490091290; x=1521627290; h=from:to:cc:subject:date:message-id; bh=l18hG7+r0ikHoZWU/CsCDIVTsH3J045IviIkNUBSJvU=; b=SoKlc0GJ2W9GeF+8UM5nxmTJxR5mGZnKdh+8JVWvSZlyHplQFxcYbn2Q PtzVpOUz0trCq07dSpswkW8rY9BUlw==; Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by fmsmga102.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Mar 2017 03:14:49 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.36,198,1486454400"; d="scan'208";a="836967188" Received: from jnikula-mobl.fi.intel.com (HELO localhost) ([10.237.72.162]) by FMSMGA003.fm.intel.com with ESMTP; 21 Mar 2017 03:14:48 -0700 From: Jani Nikula To: intel-gfx@lists.freedesktop.org Date: Tue, 21 Mar 2017 12:14:31 +0200 Message-Id: <9850917e60104f97809fac670d9ba68ea5130ac0.1490091134.git.jani.nikula@intel.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: References: In-Reply-To: References: Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo Cc: jani.nikula@intel.com Subject: [Intel-gfx] [PATCH 5/8] dim: avoid errors with rm $foo/ expanding to / X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP Fix shellcheck SC2115: Use "${var:?}" to ensure this never expands to /. Signed-off-by: Jani Nikula --- dim | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/dim b/dim index 0fe125335a67..8bbff67b3f80 100755 --- a/dim +++ b/dim @@ -461,18 +461,26 @@ function rr_cache_dir function update_rerere_cache { + local rerere + + rerere=$(rr_cache_dir) + cd $DIM_PREFIX/drm-rerere/ git pull - mkdir $(rr_cache_dir) &> /dev/null || true - cp rr-cache/* $(rr_cache_dir) -r + mkdir ${rerere:?} &> /dev/null || true + cp rr-cache/* ${rerere:?} -r cd - > /dev/null } function dim_revert_rerere { + local rerere + + rerere=$(rr_cache_dir) + cd $DIM_PREFIX/drm-rerere/ git revert $1 - rm $(rr_cache_dir)/* -Rf + rm -Rf ${rerere:?}/* } dim_alias_rebuild_nightly=rebuild-tip @@ -974,7 +982,7 @@ function dim_remove_branch cd $DIM_PREFIX/$DIM_DRM_INTEL if [[ -d $DIM_PREFIX/$branch ]] ; then - rm -R $DIM_PREFIX/$branch + rm -R ${DIM_PREFIX:?}/$branch git worktree prune &> /dev/null || true fi