diff options
| -rw-r--r-- | Makefile | 32 | ||||
| -rw-r--r-- | argv.go | 2 | ||||
| -rw-r--r-- | debian.go | 9 |
3 files changed, 7 insertions, 36 deletions
@@ -41,37 +41,5 @@ check-git-clean: old-debian-release: install wit-test debian --dry-run --verbose --release -debian-release: install - forge dirty - rm -f ~/incoming/*.deb - rm -f ~/go/lib/go-gui/* - forge --install go.wit.com/apps/go-deb - go-deb -h # check to make sure go-deb builds - wit-test debian --verbose - ls -hl ~/incoming/ - do-aptly - rm -f ~/go/bin/forged # causes bash completion annoyances - -debian-release-force: install - forge dirty - rm -f ~/incoming/*.deb - rm -f ~/go/lib/go-gui/* - forge --install go.wit.com/apps/go-deb - go-deb -h # check to make sure go-deb builds - wit-test debian --force --verbose - ls -hl ~/incoming/ - -dpkg-deb -c ~/incoming/go-gui-toolkits*.deb - do-aptly - rm -f ~/go/bin/forged # causes bash completion annoyances - debian-release-build-only: install wit-test debian --verbose --release - -# build packages no matter what -debian-force: - rm -f ~/incoming/*.deb - rm -f ~/incoming-devel/*.deb - wit-test debian --force --verbose - -mv ~/incoming-devel/*.deb ~/incoming/ - do-aptly - rm -f ~/go/bin/forged # causes bash completion annoyances @@ -100,7 +100,7 @@ func (args) Appname() string { func (a args) DoAutoComplete(pb *prep.Auto) { if pb.Cmd == "" { - pb.Autocomplete3([]string{"push", "build", "debian", "--install", "upgrade", "macos", "git", "--witcom --version --dry-run"}) + pb.Autocomplete3([]string{"push", "build", "debian", "--install", "upgrade", "macos", "git", "--witcom --version --dry-run --force"}) } else { pb.SubCommand(pb.Goargs...) } @@ -89,6 +89,12 @@ func buildDeb() { } func getOutdir(repo *gitpb.Repo) string { + if me.forge.Config.IsPrivate(repo.GetGoPath()) { + return "/home/jcarr/incoming-private" + } + if argv.Force { + return "/home/jcarr/incoming" + } if repo.GetLastTag() != repo.GetMasterVersion() { return "/home/jcarr/incoming-devel" } @@ -101,8 +107,5 @@ func getOutdir(repo *gitpb.Repo) string { return "/home/jcarr/incoming-devel" } - if me.forge.Config.IsPrivate(repo.GetGoPath()) { - return "/home/jcarr/incoming-private" - } return "/home/jcarr/incoming" } |