From: Nicolas Boisselier Date: Sat, 19 Mar 2016 15:27:54 +0000 (+0000) Subject: delete nb_repo_dirs X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=407162215e16e68ffa1fb2f8aa46eabc29f6d10e;p=nb.git delete nb_repo_dirs --- diff --git a/etc/profile.d/envs b/etc/profile.d/envs index b03fc08a..bad939c5 100644 --- a/etc/profile.d/envs +++ b/etc/profile.d/envs @@ -31,7 +31,7 @@ env_add_path &>/dev/null && PATH=`env_add_path "$PATH" \ /usr/share/awstats/tools \ /home/bin \ /home/www/wp/bin \ - $(nb_repo_dirs | xargs -n1 -IZ printf '%s\n%s\n' "Z/bin" "Z/sbin" 2>/dev/null) + $(nb-repo-dirs | xargs -n1 -IZ printf '%s\n%s\n' "Z/bin" "Z/sbin" 2>/dev/null) ` export PATH diff --git a/etc/profile.d/functions b/etc/profile.d/functions index 2b5977ca..3891dfba 100644 --- a/etc/profile.d/functions +++ b/etc/profile.d/functions @@ -312,25 +312,6 @@ jpg2avi() { rm -f "$still" } -nb_repo_dirs() { - if [ -e $NB_ROOT/bin/nb-repo-dirs ]; then - $NB_ROOT/bin/nb-repo-dirs - return - fi - ( - ls -d \ - $NB_ROOT \ - /opt/backup_servers \ - /{opt,home/www}/rent \ - root:/etc/puppet \ - /etc/puppet/data \ - /etc/puppet/modules \ - /home/www/izideal \ - 2>/dev/null - (ls /{opt,home,home/www}/*/.nb-install | xargs -n1 dirname) 2>/dev/null - ) | perl -ne '/^\s*$/ and next; s/^\s+//; print unless $h{$_}++' -} - cron_d_install() { declare usage fname file exp cron tmp test usage="Usage: $FUNCNAME [-t|--test] [CRON_D_FILE] [IGNORE_REGEXP] or [NAME] [CRON_D_CONTENT] [IGNORE_REGEXP]"