dmitriy.kazimirov/inxi
1
0
Fork 0
mirror of https://github.com/smxi/inxi.git synced 2024-11-16 16:21:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

new tarball, same version. More fixes to avoid failures on -r for various ssystems

Browse source
This commit is contained in:
inxi-svn 2014-09-24 20:40:49 +00:00
parent 0c8f2108dd
commit 39e240b6d6
1 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
inxi
View file

@ -9287,6 +9287,7 @@ get_repo_data()
fi fi
fi fi
done done
repo_data_working=''
fi fi
# yum - fedora, redhat, centos, etc. Note that rpmforge also may create apt sources # yum - fedora, redhat, centos, etc. Note that rpmforge also may create apt sources
# in /etc/apt/sources.list.d/. Therefore rather than trying to assume what package manager is # in /etc/apt/sources.list.d/. Therefore rather than trying to assume what package manager is
@ -9371,10 +9372,10 @@ get_repo_data()
REPO_DATA="$REPO_DATA REPO_DATA="$REPO_DATA
$repo_data_working" $repo_data_working"
fi fi
repo_data_working=''
fi fi
done done
fi fi
repo_data_working=''
# pacman - archlinux, going to assume that pisi and arch/pacman, etc don't have the above issue with apt/yum # pacman - archlinux, going to assume that pisi and arch/pacman, etc don't have the above issue with apt/yum
elif [[ -f $pacman_conf ]];then elif [[ -f $pacman_conf ]];then
# get list of mirror include files, trim white space off ends # get list of mirror include files, trim white space off ends
@ -9411,6 +9412,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_data_working=''
# pisi - pardus # pisi - pardus
elif [[ -f $slackpkg_file ]];then elif [[ -f $slackpkg_file ]];then
# note, only one file, but loop it in case more are added in future # note, only one file, but loop it in case more are added in future
@ -9429,6 +9431,7 @@ $repo_data_working"
fi fi
fi fi
done done
repo_data_working=''
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 )"
log_function_data "pisi-list-repo: $REPO_DATA" log_function_data "pisi-list-repo: $REPO_DATA"
@ -9459,6 +9462,7 @@ $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_data_working=''
# Mandriva/Mageia using: urpmq # Mandriva/Mageia using: urpmq
elif type -p urpmq &>/dev/null;then elif type -p urpmq &>/dev/null;then
REPO_DATA="$( urpmq --list-media active --list-url )" REPO_DATA="$( urpmq --list-media active --list-url )"
@ -9511,7 +9515,7 @@ $repo_data_working"
log_function_data 'cat' "$repo_files" log_function_data 'cat' "$repo_files"
for repo_file in $repo_files for repo_file in $repo_files
do do
repo_data_working="$repo_data_working$( gawk -v repoFile=$repo_file ' repo_data_working="$( gawk -v repoFile=$repo_file '
BEGIN { BEGIN {
FS=":" FS=":"
IGNORECASE=1 IGNORECASE=1
@ -9541,13 +9545,13 @@ $repo_data_working"
} }
} }
' $repo_file )" ' $repo_file )"
done if [[ -z $REPO_DATA ]];then
fi REPO_DATA="$repo_data_working"
if [[ -z $REPO_DATA ]];then elif [[ -n $repo_data_working ]];then
REPO_DATA="$repo_data_working" REPO_DATA="$REPO_DATA
elif [[ -n $repo_data_working ]];then
REPO_DATA="$REPO_DATA
$repo_data_working" $repo_data_working"
fi
done
fi fi
repo_data_working='' repo_data_working=''
elif [[ -f $openbsd_conf ]];then elif [[ -f $openbsd_conf ]];then