From f68b0febfb890ad30b58ebb2bc5b15c7b51218b7 Mon Sep 17 00:00:00 2001
From: Michael Prokop <mika@grml.org>
Date: Thu, 16 Aug 2012 13:19:01 +0200
Subject: [PATCH] Drop userContent support

The ArtifactDeployer isn't the prefered choice and there's
no reason to make BASE_PATH handling more confusing than necessary,
so just drop the userContent magic.
---
 scripts/build-and-provide-package | 10 ++--------
 scripts/generate-git-snapshot     |  6 ------
 scripts/generate-svn-snapshot     |  6 ------
 3 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/scripts/build-and-provide-package b/scripts/build-and-provide-package
index db7be47..820457a 100755
--- a/scripts/build-and-provide-package
+++ b/scripts/build-and-provide-package
@@ -82,14 +82,8 @@ set_base_path() {
   if [ -n "${BASE_PATH:-}" ] ; then
     echo "*** Using provided ${BASE_PATH} as BASE_PATH ***"
   else
-    echo "*** No BASE_PATH set. ***"
-    if [ -z "${distribution:-}" ]; then
-      BASE_PATH="${JENKINS_HOME}/userContent/${PACKAGE}-source/"
-      echo "*** No BASE_PATH set but \$distribution is set, using $BASE_PATH as BASE_PATH ***"
-    else
-      BASE_PATH="${JENKINS_HOME}/userContent/${PACKAGE}-source/distribution=${distribution}/"
-      echo "*** Neither BASE_PATH nor \$distribution set, using $BASE_PATH as BASE_PATH ***"
-    fi
+    BASE_PATH="${WORKSPACE}"
+    echo "*** Using \$WORKSPACE [$BASE_PATH] as default BASE_PATH ***"
   fi
 
 }
diff --git a/scripts/generate-git-snapshot b/scripts/generate-git-snapshot
index 62aad7d..352d83a 100755
--- a/scripts/generate-git-snapshot
+++ b/scripts/generate-git-snapshot
@@ -206,10 +206,4 @@ git branch -D "$random_branch"
 # revert to original debian/changelog to avoid merge conflicts
 git checkout -- debian/changelog
 
-# needed for deploying artifacts
-mkdir -p ${JENKINS_HOME}/userContent/${JOB_NAME}/
-
-echo "Cleaning up ${JENKINS_HOME}/userContent/${JOB_NAME} to get rid of possibly outdated data"
-rm -f "${JENKINS_HOME}/userContent/${JOB_NAME}/"*
-
 # vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2
diff --git a/scripts/generate-svn-snapshot b/scripts/generate-svn-snapshot
index b87f3cf..52e2d56 100755
--- a/scripts/generate-svn-snapshot
+++ b/scripts/generate-svn-snapshot
@@ -164,10 +164,4 @@ fi
 # revert to original debian/changelog to avoid highly increasing version numbers with each build
 ( cd source/${branch:-} ; svn revert debian/changelog )
 
-# needed for deploying artifacts
-mkdir -p "${JENKINS_HOME}/userContent/${JOB_NAME}/"
-
-echo "*** Cleaning up ${JENKINS_HOME}/userContent/${JOB_NAME} to get rid of possibly outdated data ***"
-rm -f "${JENKINS_HOME}/userContent/${JOB_NAME}/"*
-
 # vim:foldmethod=marker ts=2 ft=sh ai expandtab sw=2