[Intel-gfx] [PATCH 5/8] dim: avoid errors with rm $foo/ expanding to /

[Jani Nikula]

On Tue, 21 Mar 2017, Daniel Vetter <daniel at ffwll.ch> wrote:
> On Tue, Mar 21, 2017 at 12:14:31PM +0200, Jani Nikula wrote:
>> Fix shellcheck SC2115: Use "${var:?}" to ensure this never expands to /.
>> 
>> Signed-off-by: Jani Nikula <jani.nikula at intel.com>
>
> I'm not sold on these because if those are ever unset, dim will fail all
> over the place.

Yup, like at the top where we specifically ensure $DIM_PREFIX is not
empty!

> I'm leaning towards shutting this one up.

I know, I was divided about this one as well, but erred on the safe side
because 'rm -Rf /*' is such a huge failure mode.

I could lean either way.

BR,
Jani.



> -Daniel
>
>> ---
>>  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
>>  
>> -- 
>> 2.1.4
>> 
>> _______________________________________________
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center