X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=trunk%2Fexec%2Frepopulate;h=a376fd92c7f78968269b16e34216691812ab529d;hb=b6dae731de65e084f9e780de635a0462011f5cb8;hp=72e23ccbd13135997e277fb945554a701884bd4b;hpb=8c9d3d4261211e0e6fc9ff8388d2cb4c89577003;p=cran2deb.git diff --git a/trunk/exec/repopulate b/trunk/exec/repopulate index 72e23cc..a376fd9 100755 --- a/trunk/exec/repopulate +++ b/trunk/exec/repopulate @@ -6,16 +6,10 @@ set -e -dir=/etc/cran2deb -if [ -e /etc/cran2deb/config ]; then - . /etc/cran2deb/config; -elif [ -r ~/.cran2deb/config ]; then - dir=~/.cran2deb/ - . ~/.cran2deb/config; -fi; +dir=${CRAN2DEB_CONFIDR:-/etc/cran2deb} if [ ! -d "$dir" ]; then - echo "Dir $dir not existing." + echo "Dir $dir does not exist." exit -1 fi @@ -23,11 +17,13 @@ umask 002 echo "Setting 'root' var to '$1'." root=$1 shift -for x in $(find "${dir}" -type f -name '*.in'); do +OLDIFS="$IFS" +IFS="$(echo -ne '\0')" +for x in $(find "${dir}" -type f -name '*.in' -print0); do #echo "x=$x" - y=$(echo $x | sed -e 's,.in$,,') - sed -e "s:@ROOT@:$root:g" <"$x" >"$y" + sed -e "s:@ROOT@:$root:g" <"$x" > "${x%%.in}" done +IFS="$OLDIFS" # now do an update to reflect any config changes echo "Starting '$root/exec/update"