no longer necessary to merge changes

[code/mbuild.git] / rc

diff --git a/rc b/rc
index 1d1205729ffd9f98b000b39748431d0b3fc687e8..713babc519aa233f85888cb9627aa6683d52dcf7 100644 (file)
--- a/rc
+++ b/rc
@@ -1,38 +1,47 @@
 REPREPRO_DIR=$HOME/reprepro
 BASE_URL=http://debian.madduck.net/repo
 
 REPREPRO_DIR=$HOME/reprepro
 BASE_URL=http://debian.madduck.net/repo
 

+files=
+

 print_repo_paths() {
   local pkg; pkg="${1##*/}"; pkg="${pkg%%_*}"
   local let; let="$(echo "$pkg" | cut -c1)"
 
   sed -rne 's,^[[:space:]]+[[:xdigit:]]+ [[:digit:]]++ (([-[:alpha:]]+)/)?[-_[:alpha:]]+ [[:alpha:]]+ (.+$),\3 \2,p' "$1" | \
 print_repo_paths() {
   local pkg; pkg="${1##*/}"; pkg="${pkg%%_*}"
   local let; let="$(echo "$pkg" | cut -c1)"
 
   sed -rne 's,^[[:space:]]+[[:xdigit:]]+ [[:digit:]]++ (([-[:alpha:]]+)/)?[-_[:alpha:]]+ [[:alpha:]]+ (.+$),\3 \2,p' "$1" | \

-    while read file section; do
+    files="$(while read file section; do

       case "$file" in
         *.diff.gz|*.tar.gz) continue;;
       case "$file" in
         *.diff.gz|*.tar.gz) continue;;

-        *) echo "$BASE_URL/pool/${section:-main}/$let/$pkg/${file##*/}";;
+        *) echo "$BASE_URL/pool/${section:-main}/$let/$pkg/${file##*/}}";;

       esac
       esac

-    done
+    done)"

 }
 
 dinstall() {
   local dist
   case "$1" in
 }
 
 dinstall() {
   local dist
   case "$1" in

-    stable) dist=etch;;
-    testing) dist=lenny;;
+    stable*) dist=lenny;;
+    testing*) dist=squeeze;;

     unstable) dist=sid;;
     unstable) dist=sid;;

+    madduck) dist=madduck;;

     experimental|*-backports) dist="$1";;
     *) echo E: unknown distribution: "$1" >&2; exit 1;;
   esac
 
     experimental|*-backports) dist="$1";;
     *) echo E: unknown distribution: "$1" >&2; exit 1;;
   esac
 

+  copy_back_files "$@"
+
+  return 0
+

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

-get_bundle_location() {
+print_bundle_location() {

   local file; file="${1##*/}"
   echo "$BASE_URL/bundles/$file"
   local file; file="${1##*/}"
   echo "$BASE_URL/bundles/$file"

+  #TODO: files does not work
+  echo "$files"

 }
 
 KEYID=330c4a75
 }
 
 KEYID=330c4a75