texlive[44810] Master/tlpkg: more fixes and simplifications

[commits+preining at tug.org]

Revision: 44810
          http://tug.org/svn/texlive?view=revision&revision=44810
Author:   preining
Date:     2017-07-15 15:01:41 +0200 (Sat, 15 Jul 2017)
Log Message:
-----------
more fixes and simplifications

Modified Paths:
--------------
    trunk/Master/tlpkg/bin/ctan2tl
    trunk/Master/tlpkg/libexec/place

Modified: trunk/Master/tlpkg/bin/ctan2tl
===================================================================
--- trunk/Master/tlpkg/bin/ctan2tl	2017-07-15 13:01:27 UTC (rev 44809)
+++ trunk/Master/tlpkg/bin/ctan2tl	2017-07-15 13:01:41 UTC (rev 44810)
@@ -11,6 +11,11 @@
 libexec=`cd $mydir/../libexec && pwd`	# Master/tlpkg/libexec
 PATH=$mydir:$libexec:$PATH  # we call lots of our other tools
 
+Build=`cd $mydir/../../../Build && pwd`
+raw=$Build/tmp.raw
+test -d $raw || mkdir $raw
+cd $raw || exit 1
+
 if test "x$1" = x--help; then
   echo "Usage: $0 [--place] [--no-ctan] TLPKGNAME"
   echo
@@ -49,15 +54,11 @@
       ;;
     '--contrib')
       do_contrib=true
-      contrib_ctan2tds_arg=--contrib
-      contrib_place_arg="--contrib=/home/norbert/Development/TeX/tlcontrib --mode=git"
       shift
-      continue
-      ;;
-    '--buildplace')
+      contrib_place="$1"
       shift
-      Build=$1
-      shift
+      contrib_ctan2tds_arg=--contrib
+      contrib_place_arg="--contrib=$contrib_place --mode=git"
       continue
       ;;
     *)
@@ -66,15 +67,6 @@
   esac
 done
 
-if [ "x$Build" = "x" ] ; then
-  Build=`cd $mydir/../../../Build && pwd`
-fi
-
-raw=$Build/tmp.raw
-test -d $raw || mkdir $raw
-cd $raw || exit 1
-
-
 pkg=$1
 if test -z "$pkg"; then
   echo "$0: no TL package name specified." >&2

Modified: trunk/Master/tlpkg/libexec/place
===================================================================
--- trunk/Master/tlpkg/libexec/place	2017-07-15 13:01:27 UTC (rev 44809)
+++ trunk/Master/tlpkg/libexec/place	2017-07-15 13:01:41 UTC (rev 44810)
@@ -322,7 +322,7 @@
     $dirs{$newdir}++;
     return;
   }
-    
+
   my $needed_dirs = "";
   #until (-d "$dir/.svn") {
   until (&is_svn_dir($dir)) {