and some code cleanup

This commit is contained in:
inxi-svn 2010-02-01 06:23:44 +00:00
parent 58d12b30ab
commit a5c6296f6b

4
inxi
View file

@ -3244,7 +3244,6 @@ $repo_data_working"
# pisi - pardus # pisi - pardus
elif [[ -d $pisi_dir && -n $( type -p pisi ) ]];then elif [[ -d $pisi_dir && -n $( type -p pisi ) ]];then
REPO_DATA="$( pisi list-repo )" REPO_DATA="$( pisi list-repo )"
REPO_FILE_ID='pisi repo'
# now we need to create the structure: repo info: repo path # now we need to create the structure: repo info: repo path
# we do that by looping through the lines of the output and then # we do that by looping through the lines of the output and then
# putting it back into the <data>:<url> format print repos expects to see # putting it back into the <data>:<url> format print repos expects to see
@ -3260,9 +3259,9 @@ $repo_data_working"
done <<< "$REPO_DATA" done <<< "$REPO_DATA"
# echo and execute the line breaks inserted # echo and execute the line breaks inserted
REPO_DATA="$( echo -e $repo_data_working )" REPO_DATA="$( echo -e $repo_data_working )"
REPO_FILE_ID='pisi repo'
# pacman - archlinux # pacman - archlinux
elif [[ -f $pacman_conf ]];then elif [[ -f $pacman_conf ]];then
REPO_FILE_ID='arch repo servers'
# get list of mirror include files, trim white space off ends # get list of mirror include files, trim white space off ends
repo_data_working="$( grep -i '^Include' $pacman_conf | grep -vi 'IncludePath' | cut -d '=' -f 2 | sed 's|^[[:space:]]$||g' )" repo_data_working="$( grep -i '^Include' $pacman_conf | grep -vi 'IncludePath' | cut -d '=' -f 2 | sed 's|^[[:space:]]$||g' )"
# sort into unique paths only, to be used to search for server = data # sort into unique paths only, to be used to search for server = data
@ -3275,6 +3274,7 @@ $repo_data_working"
done done
# execute line breaks # execute line breaks
REPO_DATA="$( echo -e $repo_data_working2 )" REPO_DATA="$( echo -e $repo_data_working2 )"
REPO_FILE_ID='arch repo servers'
fi fi
eval $LOGFE eval $LOGFE
} }