minor updates

diff --git a/rc b/rc
index 595d83d84868a1f25581376a8944e573b6d929ec..78a4746e0403a70178ee5cb64563eac270fa38ce 100644 (file)
--- a/rc
+++ b/rc
@@ -26,6 +26,8 @@ dinstall() {
     *) echo E: unknown distribution: "$1" >&2; exit 1;;
   esac
 
     *) echo E: unknown distribution: "$1" >&2; exit 1;;
   esac
 

+  copy_back_files "$@"
+

   GNUPGHOME="$REPREPRO_DIR"/.gnupg \
     reprepro --basedir "$REPREPRO_DIR" include "$dist" "$2" || :
 
   GNUPGHOME="$REPREPRO_DIR"/.gnupg \
     reprepro --basedir "$REPREPRO_DIR" include "$dist" "$2" || :
 


@@ -35,6 +37,7 @@ dinstall() {
 print_bundle_location() {
   local file; file="${1##*/}"
   echo "$BASE_URL/bundles/$file"
 print_bundle_location() {
   local file; file="${1##*/}"
   echo "$BASE_URL/bundles/$file"

+  #TODO: files does not work

   echo "$files"
 }
 
   echo "$files"
 }
 

diff --git a/sbuild-wrapper.sh b/sbuild-wrapper.sh
index 0d561d40b0cc3533e0ebabacd791c4c376d24060..731e1bd78f5051d6fe21491cd140526dd2f87797 100755 (executable)
--- a/sbuild-wrapper.sh
+++ b/sbuild-wrapper.sh
@@ -14,10 +14,13 @@ trap "cd / && rm -R '$BUILDDIR'" 0
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"
 
 BUNDLE_DIR="${TMPDIR:-/tmp}"
 TARGET_DIR="$PWD"

-dinstall() {
+copy_back_files() {

   echo "Copying files destined for $1 back to $TARGET_DIR..."
   dcmd cp -v "$2" "$TARGET_DIR"
 }
   echo "Copying files destined for $1 back to $TARGET_DIR..."
   dcmd cp -v "$2" "$TARGET_DIR"
 }

+dinstall() {
+  copy_back_files "$@"
+}

 print_bundle_location() {
   echo "Bundle available at $@ ."
 }
 print_bundle_location() {
   echo "Bundle available at $@ ."
 }


@@ -115,13 +118,14 @@ sbuild $sbuild_args --arch="$arch" --arch-all --dist="$dist" --keyid=$KEYID \
 
 changesfile="${packagenameversion}_${arch}.changes"
 
 
 changesfile="${packagenameversion}_${arch}.changes"
 

-dinstall "$dist" "$schangesfile"
-dinstall "$dist" "$changesfile"
-

 mv "$changesfile" "${changesfile}.binonly"
 mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
 rm "${changesfile}.binonly" "$schangesfile"
 
 mv "$changesfile" "${changesfile}.binonly"
 mergechanges "$schangesfile" "${changesfile}.binonly" > "$changesfile"
 rm "${changesfile}.binonly" "$schangesfile"
 

+#TODO sign here
+
+dinstall "$dist" "$changesfile"
+

 DATESTR="$(date +%Y.%m.%d.%H%M%S)"
 BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"
 
 DATESTR="$(date +%Y.%m.%d.%H%M%S)"
 BUILD_PREFIX="${packagenameversion}_${arch}.${DATESTR}"