Fetch now wants full name (13.2-RELEASE), limit pkg to download/extract
This commit is contained in:
parent
6a8b022165
commit
26b8973c6c
138
cmd/fetch.go
138
cmd/fetch.go
@ -23,7 +23,9 @@ const (
|
||||
)
|
||||
|
||||
var (
|
||||
FetchFiles = []string{"base.txz", "lib32.txz", "src.txz"}
|
||||
// TODO : Make this a config/cmd line setting
|
||||
//FetchFiles = []string{"base.txz", "lib32.txz", "src.txz"}
|
||||
FetchFiles = []string{"base.txz"}
|
||||
)
|
||||
|
||||
// TODO: Check if files already exist
|
||||
@ -66,9 +68,9 @@ func fetchRelease(release string, proto string, arch string, datastore string, f
|
||||
}
|
||||
}
|
||||
|
||||
// Create download/XX.X-RELEASE dataset if necessary
|
||||
thisDownloadDsName := fmt.Sprintf("%s/%s-RELEASE", downloadDsName, release)
|
||||
thisDownloadDsMountPoint := fmt.Sprintf("%s/%s-RELEASE", downloadDsMountPoint, release)
|
||||
// Create download/XX.X dataset if necessary
|
||||
thisDownloadDsName := fmt.Sprintf("%s/%s", downloadDsName, release)
|
||||
thisDownloadDsMountPoint := fmt.Sprintf("%s/%s", downloadDsMountPoint, release)
|
||||
exist, err = doZfsDatasetExist(thisDownloadDsName)
|
||||
if err != nil {
|
||||
return fmt.Errorf("Error accessing dataset %s: %v\n", thisDownloadDsName, err)
|
||||
@ -82,9 +84,9 @@ func fetchRelease(release string, proto string, arch string, datastore string, f
|
||||
|
||||
var fetchUrl string
|
||||
if len(fetchFrom) > 0 {
|
||||
fetchUrl = fmt.Sprintf("%s/%s-RELEASE", fetchFrom, release)
|
||||
fetchUrl = fmt.Sprintf("%s/%s", fetchFrom, release)
|
||||
} else {
|
||||
fetchUrl = fmt.Sprintf("%s://%s/%s/%s/%s-RELEASE", proto, ReleaseServer, ReleaseRootDir, arch, release)
|
||||
fetchUrl = fmt.Sprintf("%s://%s/%s/%s/%s", proto, ReleaseServer, ReleaseRootDir, arch, release)
|
||||
}
|
||||
log.Debugf("FetchURL = %s", fetchUrl)
|
||||
|
||||
@ -153,9 +155,9 @@ func extractRelease(release string, datastore string) {
|
||||
}
|
||||
}
|
||||
|
||||
// Create releases/XX.X-RELEASE dataset if necessary
|
||||
thisReleaseDsName := fmt.Sprintf("%s/%s-RELEASE", releaseDsName, release)
|
||||
thisReleaseDsMountPoint := fmt.Sprintf("%s/%s-RELEASE", releaseDsMountPoint, release)
|
||||
// Create releases/XX.X dataset if necessary
|
||||
thisReleaseDsName := fmt.Sprintf("%s/%s", releaseDsName, release)
|
||||
thisReleaseDsMountPoint := fmt.Sprintf("%s/%s", releaseDsMountPoint, release)
|
||||
exist, err = doZfsDatasetExist(thisReleaseDsName)
|
||||
if err != nil {
|
||||
fmt.Printf("Error accessing dataset %s: %v\n", thisReleaseDsName, err)
|
||||
@ -169,7 +171,7 @@ func extractRelease(release string, datastore string) {
|
||||
}
|
||||
}
|
||||
|
||||
// Create releases/XX.X-RELEASE/root dataset if necessary
|
||||
// Create releases/XX.X/root dataset if necessary
|
||||
thisReleaseRootDsName := fmt.Sprintf("%s/root", thisReleaseDsName)
|
||||
thisReleaseRootDsMountPoint := fmt.Sprintf("%s/root", thisReleaseDsMountPoint)
|
||||
exist, err = doZfsDatasetExist(thisReleaseRootDsName)
|
||||
@ -185,9 +187,9 @@ func extractRelease(release string, datastore string) {
|
||||
}
|
||||
}
|
||||
|
||||
// Now extract download/$RELEASE/*.txz to releases/XX.X-RELEASE/root
|
||||
// Now extract download/$RELEASE/*.txz to releases/XX.X/root
|
||||
downloadDsMountPoint := fmt.Sprintf("%s/download", ds.Mountpoint)
|
||||
downloadDir := fmt.Sprintf("%s/%s-RELEASE", downloadDsMountPoint, release)
|
||||
downloadDir := fmt.Sprintf("%s/%s", downloadDsMountPoint, release)
|
||||
|
||||
d, err := os.Open(downloadDir)
|
||||
defer d.Close()
|
||||
@ -201,67 +203,69 @@ func extractRelease(release string, datastore string) {
|
||||
return
|
||||
}
|
||||
|
||||
// Extract every .txz files
|
||||
// Extract every .txz files in FetchFiles
|
||||
for _, fi := range files {
|
||||
if false == fi.IsDir() {
|
||||
if strings.HasSuffix(fi.Name(), ".txz") {
|
||||
ar := fmt.Sprintf("%s/%s", downloadDir, fi.Name())
|
||||
fmt.Printf("Extracting file %s... ", ar)
|
||||
// pure Go method, sorry this is so slow. Also I did not handle permissions in this
|
||||
/* f, err := os.Open(ar)
|
||||
defer f.Close()
|
||||
if err != nil {
|
||||
fmt.Printf("Can not open %s: %v\n", ar, err)
|
||||
return
|
||||
}
|
||||
// xz reader
|
||||
r, err := xz.NewReader(f)
|
||||
if err != nil {
|
||||
fmt.Printf("Can not read %s: %v\n", ar, err)
|
||||
return
|
||||
}
|
||||
// tar reader
|
||||
tr := tar.NewReader(r)
|
||||
// Iterate through the files in the archive.
|
||||
for {
|
||||
hdr, err := tr.Next()
|
||||
if err == io.EOF {
|
||||
// end of tar archive
|
||||
break
|
||||
}
|
||||
if isStringInArray(FetchFiles, fi.Name()) {
|
||||
ar := fmt.Sprintf("%s/%s", downloadDir, fi.Name())
|
||||
fmt.Printf("Extracting file %s to %s... ", ar, thisReleaseRootDsMountPoint)
|
||||
// pure Go method, sorry this is so slow. Also I did not handle permissions in this
|
||||
/* f, err := os.Open(ar)
|
||||
defer f.Close()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
fmt.Printf("Can not open %s: %v\n", ar, err)
|
||||
return
|
||||
}
|
||||
switch hdr.Typeflag {
|
||||
case tar.TypeDir:
|
||||
// create a directory
|
||||
dest := fmt.Sprintf("%s/%s", thisReleaseRootDsMountPoint, hdr.Name)
|
||||
// FIXME: Access rights?
|
||||
err = os.MkdirAll(dest, 0777)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
case tar.TypeReg, tar.TypeRegA:
|
||||
// write a file
|
||||
dest := fmt.Sprintf("%s/%s", thisReleaseRootDsMountPoint, hdr.Name)
|
||||
w, err := os.Create(dest)
|
||||
defer w.Close()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
_, err = io.Copy(w, tr)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
// xz reader
|
||||
r, err := xz.NewReader(f)
|
||||
if err != nil {
|
||||
fmt.Printf("Can not read %s: %v\n", ar, err)
|
||||
return
|
||||
}
|
||||
// tar reader
|
||||
tr := tar.NewReader(r)
|
||||
// Iterate through the files in the archive.
|
||||
for {
|
||||
hdr, err := tr.Next()
|
||||
if err == io.EOF {
|
||||
// end of tar archive
|
||||
break
|
||||
}
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
switch hdr.Typeflag {
|
||||
case tar.TypeDir:
|
||||
// create a directory
|
||||
dest := fmt.Sprintf("%s/%s", thisReleaseRootDsMountPoint, hdr.Name)
|
||||
// FIXME: Access rights?
|
||||
err = os.MkdirAll(dest, 0777)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
case tar.TypeReg, tar.TypeRegA:
|
||||
// write a file
|
||||
dest := fmt.Sprintf("%s/%s", thisReleaseRootDsMountPoint, hdr.Name)
|
||||
w, err := os.Create(dest)
|
||||
defer w.Close()
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
_, err = io.Copy(w, tr)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
}
|
||||
*/
|
||||
cmd := fmt.Sprintf("/usr/bin/tar xpf %s -C %s", ar, thisReleaseRootDsMountPoint)
|
||||
out, err := executeCommand(cmd)
|
||||
if err != nil && len(out) > 0 {
|
||||
fmt.Printf("Error: %v: %s\n", err, out)
|
||||
} else {
|
||||
fmt.Printf("Done\n")
|
||||
}
|
||||
}
|
||||
*/
|
||||
cmd := fmt.Sprintf("/usr/bin/tar xpf %s -C %s", ar, thisReleaseRootDsMountPoint)
|
||||
out, err := executeCommand(cmd)
|
||||
if err != nil && len(out) > 0 {
|
||||
fmt.Printf("Error: %v: %s\n", err, out)
|
||||
} else {
|
||||
fmt.Printf("Done\n")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user