name fixups

This commit is contained in:
Jeff Carr 2024-11-22 11:14:55 -06:00
parent 3ba652743c
commit 5f65e4f4be
3 changed files with 25 additions and 3 deletions

View File

@ -24,7 +24,7 @@ message Repo {
string develBranch = 9; // whatever the git 'devel' branch name is string develBranch = 9; // whatever the git 'devel' branch name is
string userBranch = 10; // whatever your username branch is string userBranch = 10; // whatever your username branch is
string debname = 11; // the actual name used with 'apt install' (or distro apt equivalent. string debName = 11; // the actual name used with 'apt install' (or distro apt equivalent.
// todo: appeal to everyone to alias 'apt' on rhat, gentoo, arch, etc to alias 'apt install' // todo: appeal to everyone to alias 'apt' on rhat, gentoo, arch, etc to alias 'apt install'
// so we can make easier instructions for new linux users. KISS // so we can make easier instructions for new linux users. KISS

View File

@ -19,7 +19,7 @@ func (all *Repos) SampleConfig() {
new1 = new(Repo) new1 = new(Repo)
new1.GoPath = "go.wit.com/apps/zookeeper" new1.GoPath = "go.wit.com/apps/zookeeper"
new1.Debname = "zookeeper-go" new1.DebName = "zookeeper-go"
if all.Append(new1) { if all.Append(new1) {
log.Info("added", new1.GoPath, "ok") log.Info("added", new1.GoPath, "ok")
} else { } else {
@ -37,7 +37,7 @@ func (all *Repos) SampleConfig() {
new1 = new(Repo) new1 = new(Repo)
new1.GoPath = "go.wit.com/apps/networkQuality" new1.GoPath = "go.wit.com/apps/networkQuality"
new1.Debname = "networkquality" new1.DebName = "networkquality"
new1.ReadOnly = true new1.ReadOnly = true
if all.Append(new1) { if all.Append(new1) {
log.Info("added", new1.GoPath, "ok") log.Info("added", new1.GoPath, "ok")

View File

@ -10,6 +10,7 @@ package forgepb
*/ */
import ( import (
"path/filepath"
"strings" "strings"
) )
@ -108,3 +109,24 @@ func (all *Repos) IsPrivate(gopath string) bool {
// otherwise, assume not private // otherwise, assume not private
return match.Private return match.Private
} }
// returns the deb package
func (all *Repos) DebName(gopath string) string {
normalBase := filepath.Base(gopath)
loop := all.SortByPath()
for loop.Scan() {
r := loop.Repo()
if r.GoPath == gopath {
// if private is set here, then ok, otherwise
// still check if a Directory match exists
if r.DebName == "" {
return r.DebName
} else {
return normalBase
}
}
}
return normalBase
}