diff options
| author | Florian Pritz <bluewind@xinu.at> | 2014-02-05 00:39:14 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2015-05-27 15:46:05 +0200 |
| commit | e4e9960d734c8cbe5630454701f0289e0ed68d07 (patch) | |
| tree | 2215be887ed907655ddb0d8f4aea96c8e980a434 | |
| parent | 7becc80cc80914aa092ad2cd0e22cd305e2413b1 (diff) | |
| download | dbscripts-e4e9960d734c8cbe5630454701f0289e0ed68d07.tar.gz dbscripts-e4e9960d734c8cbe5630454701f0289e0ed68d07.tar.xz | |
fix config
Signed-off-by: Florian Pritz <bluewind@xinu.at>
| -rw-r--r-- | config | 2 | ||||
| -rw-r--r-- | db-functions | 7 |
2 files changed, 6 insertions, 3 deletions
@@ -1,4 +1,6 @@ FTP_BASE="/srv/ftp" +HISTORYREPO="" +DBSCRIPTS_USER=dbscripts SVNREPO='' SVNUSER='' PKGREPOS=() diff --git a/db-functions b/db-functions index 351aaeb..6bd3b5d 100644 --- a/db-functions +++ b/db-functions @@ -559,7 +559,7 @@ arch_history_add() { local pkgbase=$(getpkgbase "$pkgfile") local pkgver=$(getpkgver "$pkgfile") - local history_file="$GITREPO/$repo/$tarch/$pkgname" + local history_file="$HISTORYREPO/$repo/$tarch/$pkgname" mkdir -p "${history_file%/*}" echo "$pkgbase $pkgver" > "$history_file" @@ -572,7 +572,7 @@ arch_history_remove() { local pkgname="$2" local tarch="$3" - local history_file="$GITREPO/$repo/$tarch/$pkgname" + local history_file="$HISTORYREPO/$repo/$tarch/$pkgname" [[ -f "$history_file" ]] || return 1 @@ -580,7 +580,7 @@ arch_history_remove() { } arch_history_commit() { - pushd "$GITREPO" + pushd "$HISTORYREPO" if ((${#HISTORY_add_files[@]} > 0)); then git add -- "${HISTORY_add_files[@]}" fi @@ -627,6 +627,7 @@ get_file_from_pkgrepo() { # TODO: implement svn/git extraction # for git: cd $whereever; git show $tag:$filename curl -s https://projects.archlinux.org/svntogit/community.git/plain/trunk/$filename?h=packages/$pkgbase + # TODO: this requires us to restructure the repos #arch_svn cat "${SVNREPO}/${_pkgbase}/tags/$tag/$filename" } |