From: Chris Koeritz Date: Fri, 17 Jun 2022 16:04:01 +0000 (-0400) Subject: wrapped perllib to keep from being added to X-Git-Tag: 2.140.136^2~26 X-Git-Url: https://feistymeow.org/gitweb/?a=commitdiff_plain;h=2c17bf0495b27b67b0ba655b18fbb2f723071698;p=feisty_meow.git wrapped perllib to keep from being added to kept plopping more into that variable every time regenerated. durp. --- diff --git a/scripts/core/variables.sh b/scripts/core/variables.sh index c9c3d37d..fb03b6cd 100644 --- a/scripts/core/variables.sh +++ b/scripts/core/variables.sh @@ -190,24 +190,30 @@ define_yeti_variable DEFAULT_FEISTYMEOW_ORG_DIR=/opt/feistymeow.org # variables for perl. - define_yeti_variable PERLLIB+="/usr/lib/perl5" - if [ "$OS" == "Windows_NT" ]; then - define_yeti_variable PERLIO=:perlio - # choose perl's IO over the ms-windows version so we can handle file - # bytes properly. - fi + if [[ $PERLLIB =~ .*$FEISTY_MEOW_SCRIPTS.* ]]; then +#if debug! + echo skipping PERLLIB since already mentions feisty meow scripts. + else + define_yeti_variable PERLLIB+="/usr/lib/perl5" + if [ "$OS" == "Windows_NT" ]; then + define_yeti_variable PERLIO=:perlio + # choose perl's IO over the ms-windows version so we can handle file + # bytes properly. + fi - # iterate across our sub-directories and find the perl scripts. - # this currently only looks one level down. - for i in $FEISTY_MEOW_SCRIPTS/*; do - if [ -d "$i" ]; then - # check if there is a perl file present; add the folder to PERLLIB if so. - ls $i/*.pl &>/dev/null - if [ $? -eq 0 ]; then - PERLLIB+=":$(dos_to_unix_path $i)" + # iterate across our sub-directories and find the perl scripts. + # this currently only looks one level down. + for i in $FEISTY_MEOW_SCRIPTS/*; do + if [ -d "$i" ]; then + # check if there is a perl file present; add the folder to PERLLIB if so. + ls $i/*.pl &>/dev/null + if [ $? -eq 0 ]; then + PERLLIB+=":$(dos_to_unix_path $i)" + fi fi - fi - done + done + fi + define_yeti_variable PERL5LIB=$PERLLIB #echo PERLLIB is now $PERLLIB