diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2006-06-24 15:59:37 +0000 |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2006-06-24 15:59:37 +0000 |
| commit | 0a0919e5363464ef9728664d27725b5d503ec341 (patch) | |
| tree | b41908dd1ded6f13ed91185e23d495792916bf8a | |
| parent | c9bba5d477ff59fbb9e9a04ed1724043e145b8ec (diff) | |
Set variables before using them. Correct buildplace in -login.
| -rwxr-xr-x | localcowbuilder-create | 11 | ||||
| -rwxr-xr-x | localcowbuilder-login | 11 | ||||
| -rwxr-xr-x | localcowdebuild | 12 |
3 files changed, 24 insertions, 10 deletions
diff --git a/localcowbuilder-create b/localcowbuilder-create index a5e767a..67ca225 100755 --- a/localcowbuilder-create +++ b/localcowbuilder-create @@ -12,9 +12,14 @@ fi pool=$1 distro=${2:-$pool} +basepath="/var/cache/pbuilder/cow-$pool" +buildplace="/var/cache/pbuilder/build-$pool/" +aptcache="/var/cache/pbuilder/aptcache-$pool/" +buildresult="$HOME/src/pbuild-$pool/" + sudo cowbuilder --create \ - --buildresult $HOME/src/pbuild-$pool/ \ + --buildresult "$buildresult" \ --distribution "$distro" \ - --basepath /var/cache/pbuilder/cow-$pool \ - --aptcache /var/cache/pbuilder/aptcache-$pool/ \ + --basepath "$basepath" \ + --aptcache "$aptcache" \ ${3:+--othermirror "$3"} diff --git a/localcowbuilder-login b/localcowbuilder-login index 591d0ad..0ab074d 100755 --- a/localcowbuilder-login +++ b/localcowbuilder-login @@ -8,7 +8,12 @@ if [ $# -eq 0 ]; then fi pool=$1 + +basepath="/var/cache/pbuilder/cow-$pool" +buildplace="/var/cache/pbuilder/build-$pool/cow-$$" +aptcache="/var/cache/pbuilder/aptcache-$pool/" + sudo cowbuilder --login \ - --basepath /var/cache/pbuilder/cow-$pool \ - --buildplace /var/cache/pbuilder/build-$pool/ \ - --aptcache /var/cache/pbuilder/aptcache-$pool + --basepath "$basepath" \ + --buildplace "$buildplace" \ + --aptcache "$aptcache" diff --git a/localcowdebuild b/localcowdebuild index 70095f6..75bca83 100755 --- a/localcowdebuild +++ b/localcowdebuild @@ -45,15 +45,19 @@ done pbuilderopts="$pbuilderopts $@" for pool in $pools; do + basepath="/var/cache/pbuilder/cow-$pool" + buildplace="/var/cache/pbuilder/build-$pool/cow-$$" + aptcache="/var/cache/pbuilder/aptcache-$pool/" + buildresult="$HOME/src/pbuild-$pool/" pdebuild \ --pbuilder cowbuilder \ - --buildresult $HOME/src/pbuild-$pool/ \ + --buildresult "$buildresult" \ ${debbuildopts:+--debbuildopts $debbuildopts} \ $pdebuildopts \ -- \ - --basepath /var/cache/pbuilder/cow-$pool \ - --buildplace /var/cache/pbuilder/build-$pool/cow-$$ \ - --aptcache /var/cache/pbuilder/aptcache-$pool/ \ + --basepath "$basebath" \ + --buildplace "$buildplace" \ + --aptcache "$aptcache" \ --pkgname-logfile \ $pbuilderopts |