X-Git-Url: https://iankelling.org/git/?p=distro-setup;a=blobdiff_plain;f=path_add-function;h=540306ca03f0d8aed9af772b7840696f38973fce;hp=0dbaf9fa58de4533c48d68826ce03c37416959ac;hb=0b6d44c7f3d567e0a26138509c8a24cb57c69b50;hpb=45d6abc0df668267b44d39ab67ac9b8c6111e638 diff --git a/path_add-function b/path_add-function index 0dbaf9f..540306c 100644 --- a/path_add-function +++ b/path_add-function @@ -1,15 +1,29 @@ #!/bin/bash +# Copyright (C) 2016 Ian Kelling + +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at + +# http://www.apache.org/licenses/LICENSE-2.0 + +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + # avoiding bashisms so it can be used in edge cases where I don't have bash, # however, I'm not super confident that I've avoided them all # -# path_add() { local help="usage: path_add [options] PATH --help: print this --end: adds to end of path, which will give it lowest priority ---ifexists: add to path only if the directory exists" +--ifexists: add to path only if directory exists" local found x y z ifexists end loop newpath - force=false + ifexists=false end=false loop=true # portable substring matching is ugly http://mywiki.wooledge.org/BashFAQ/041 @@ -18,8 +32,8 @@ path_add() { --*) if [ "$1" = --end ]; then end=true - elif [ "$1" = --force ]; then - force=true + elif [ "$1" = --ifexists ]; then + ifexists=true elif [ "$1" = --help ]; then echo "$help" return @@ -53,8 +67,7 @@ path_add() { unset IFS PATH="$newpath" for x in "$@"; do - x="$(readlink -f "$x")" - if $force || [ -d "$x" ]; then + if ! $ifexists || [ -d "$x" ]; then if [ ! "$PATH" ]; then PATH="$x" elif $end; then