fix up some UPS things so that install works

Author: chenel

ups/make_dune_plot_style_ups_product.sh

@@ -22,7 +22,7 @@ usage() {
 # setup
 # -----------------------------------------------------------------------------
 
-if [ ${#@} != 1 ]; then
+if [ ${#@} -lt 1 ] || [ ${#@} -gt 2 ]; then
   usage
 fi 
 
@@ -67,23 +67,17 @@ echo "-------------------------------------------"
 ups active
 echo "-------------------------------------------"
 
-# check if the first argument is a valid path
-if [  -d "${tmpdir}" ]; then
-  echo "${tmpdir} already exists! Cannot do clean checkout!"
-  echo "Aborting"
-  exit 1
-fi
 
 # pull the latest version of the git repo and put it in the product directory
 # -----------------------------------------------------------------------------
 
 # clone to temp directory
-git clone -b ${version} [email protected]:DUNE/${reponame}.git ${tmpdir}/${reponame}-preorg
 preorg_dir="${tmpdir}/${reponame}-preorg"
+git clone -b ${version} [email protected]:DUNE/${reponame}.git ${preorg_dir}
 
 # the exported CMake package files need to be autogenerated by running CMake
 if which cmake > /dev/null 2>&1; then
-  builddir="$(mktemp --directory --tmpdir ${tmpdir} cmake-build.XXXXXXXXXX)"
+  builddir="$(mktemp --directory ${tmpdir}/cmake-build.XXXXXXXXXX)"
 
   echo "Running CMake to generate CMake package files."
   echo "Build directory: $builddir"
@@ -110,7 +104,7 @@ mv ${preorg_dir}/share/                   ${tmpdir}/${reponame}/
 rm -rf ${preorg_dir}
 
 proddir=${path}/${reponame}
-dest=${proddir}/${version}/NULL
+dest=${proddir}/${version}
 
 echo "$reponame will be created in $dest"
 
@@ -156,22 +150,18 @@ echo "Updating table file"
 sed -i -e "s:XXVERSIONXX:${version}:" \
   ${ups_table}
 
-echo "Declaring product ${reponame} with version ${version} to UPS."
+echo
+echo "Declaring product ${reponame} with version ${version} to UPS:"
 
 # declare to ups
-ups declare  -f NULL -z ${path} -c \
-  -r ${path}/${reponame}/${version}/ \
-  -m ${reponame}.table \
-  ${reponame} ${version}
-
-# I am sure there's a nicer way to do this but for now...
-mv ${path}/${reponame}/${version}.version ${path}/${reponame}/NULL
-mkdir ${path}/${reponame}/${version}.version/
-mv ${path}/${reponame}/NULL ${path}/${reponame}/${version}.version/
+cmd="ups declare -f NULL -z ${path} -c -r ${path}/${reponame}/${version} -m ${path}/${reponame}/${version}/ups/${reponame}.table ${reponame} ${version}"
+echo "$cmd"
+eval $cmd
 
 retval=$?
 test $retval -ne 0 && echo "Error! 'ups declare' returned non-zero - BAILING" && exit 1
 
 rm -rf ${tmpdir}
 
+echo
 echo "Done"