Simplified system command

src/build/config/init.go

@@ -11,30 +11,36 @@ var (
 	Executable       string
 	Root             string
 	Library          string
+	WorkingDirectory string
 )
 
 func init() {
 	debug.SetGCPercent(-1)
-	executable, err := os.Executable()
+
+	var err error
+	Executable, err = os.Executable()
 
 	if err != nil {
 		panic(err)
 	}
 
-	Executable = executable
+	WorkingDirectory, err = os.Getwd()
-	Root = filepath.Dir(executable)
+
+	if err != nil {
+		panic(err)
+	}
+
+	Root = filepath.Dir(Executable)
 	Library = filepath.Join(Root, "lib")
 	stat, err := os.Stat(Library)
 
-	if !os.IsNotExist(err) && stat != nil && stat.IsDir() {
+	if os.IsNotExist(err) || stat == nil || !stat.IsDir() {
-		return
+		findLibrary()
+	}
 }
 
-	dir, err := os.Getwd()
+func findLibrary() {
-
+	dir := WorkingDirectory
-	if err != nil {
-		panic(err)
-	}
 
 	for {
 		Library = path.Join(dir, "lib")

src/cli/System.go

@@ -2,35 +2,22 @@ package cli
 
 import (
 	"fmt"
-	"os"
 	"runtime"
+	"strconv"
+
+	"git.akyoto.dev/cli/q/src/build/config"
 )
 
 // System shows system information.
 func System(args []string) int {
 	line := "%-19s%s\n"
-
 	fmt.Printf(line, "Platform:", runtime.GOOS)
 	fmt.Printf(line, "Architecture:", runtime.GOARCH)
 	fmt.Printf(line, "Go:", runtime.Version())
-
+	fmt.Printf(line, "Directory:", config.WorkingDirectory)
-	// Directory
+	fmt.Printf(line, "Compiler:", config.Executable)
-	directory, err := os.Getwd()
+	fmt.Printf(line, "Library:", config.Library)
-
+	fmt.Printf(line, "Threads:", strconv.Itoa(runtime.NumCPU()))
-	if err == nil {
-		fmt.Printf(line, "Directory:", directory)
-	} else {
-		fmt.Printf(line, "Directory:", err.Error())
-	}
-
-	// Compiler
-	executable, err := os.Executable()
-
-	if err == nil {
-		fmt.Printf(line, "Compiler:", executable)
-	} else {
-		fmt.Printf(line, "Compiler:", err.Error())
-	}
 
 	return 0
 }