root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

small change

Browse source
This commit is contained in:
udeved 2014-12-08 23:18:46 +01:00
parent 6f32075ea8
commit a8ba321dea
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/util.sh
View file

@ -165,7 +165,7 @@ load_config(){
[[ -f $1 ]] || return 1 [[ -f $1 ]] || return 1
local manjaro_tools_conf="$1" manjaro_tools_conf="$1"
[[ -r ${manjaro_tools_conf} ]] && source ${manjaro_tools_conf} [[ -r ${manjaro_tools_conf} ]] && source ${manjaro_tools_conf}
@ -322,11 +322,16 @@ load_config(){
} }
load_pacman_conf(){ load_pacman_conf(){
[[ -f $1 ]] || return 1
if [[ -n ${pacman_conf} ]];then if [[ -n ${pacman_conf} ]];then
pacman_conf=${pacman_conf} pacman_conf=${pacman_conf}
else else
pacman_conf="$1" pacman_conf="$1"
fi fi
return 0
} }
load_sets(){ load_sets(){