diff options
| author | dteske <dteske@FreeBSD.org> | 2013-07-05 20:01:07 +0000 |
|---|---|---|
| committer | dteske <dteske@FreeBSD.org> | 2013-07-05 20:01:07 +0000 |
| commit | 66ac1c6e6758a9e0f1bdc441dc60c0ce17fbcb40 (patch) | |
| tree | cf527bcdb6b4b1556eedd254312a9840edbe26a9 /usr.sbin/bsdconfig | |
| parent | dae6ea95bebbdb46d17ef97e559cf84dcf37235d (diff) | |
| download | FreeBSD-src-66ac1c6e6758a9e0f1bdc441dc60c0ce17fbcb40.zip FreeBSD-src-66ac1c6e6758a9e0f1bdc441dc60c0ce17fbcb40.tar.gz | |
Oops, r252833 was not supposed to touch this file. Back-out and recommit
this file with the rest of the files it was supposed to go with.
Diffstat (limited to 'usr.sbin/bsdconfig')
| -rw-r--r-- | usr.sbin/bsdconfig/share/common.subr | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/usr.sbin/bsdconfig/share/common.subr b/usr.sbin/bsdconfig/share/common.subr index 6c0400a..32d6aba 100644 --- a/usr.sbin/bsdconfig/share/common.subr +++ b/usr.sbin/bsdconfig/share/common.subr @@ -531,22 +531,12 @@ f_index_file() if [ "$lang" ]; then awk -v keyword="$keyword" "$f_index_file_awk" \ - $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang && return + $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX.$lang && + return # No match, fall-thru to non-i18n sources fi awk -v keyword="$keyword" "$f_index_file_awk" \ - $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX && return - - # No match? Fall-thru to `local' libexec sources (add-on modules) - - [ "$BSDCFG_LOCAL_LIBE" ] || return $FAILURE - if [ "$lang" ]; then - awk -v keyword="$keyword" "$f_index_file_awk" \ - $BSDCFG_LOCAL_LIBE/*/INDEX.$lang && return - # No match, fall-thru to non-i18n sources - fi - awk -v keyword="$keyword" "$f_index_file_awk" \ - $BSDCFG_LOCAL_LIBE/*/INDEX + $BSDCFG_LIBE${BSDCFG_LIBE:+/}*/INDEX } # f_index_menusel_keyword $indexfile $pgm |
