change use-new-glibc code

JasonYangShadow · Dec 27, 2021 · be19361 · be19361
1 parent c8bebb8
commit be19361
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/build/linux/x86_64/Linux-x86_64-lpmx b/build/linux/x86_64/Linux-x86_64-lpmx
diff --git a/container/container.go b/container/container.go
@@ -146,7 +146,7 @@ func (server *RPC) RPCDelete(req Request, res *Response) error {
 	return nil
 }
 
-func Init(reset bool, deppath string, useOldGlibc bool) *Error {
+func Init(reset bool, deppath string, useNewGlibc bool) *Error {
 	currdir, err := GetConfigDir()
 	if err != nil {
 		return err
@@ -155,7 +155,7 @@ func Init(reset bool, deppath string, useOldGlibc bool) *Error {
 	config := fmt.Sprintf("%s/.lpmxsys", currdir)
 
 	//delete everything
-	if reset || useOldGlibc {
+	if reset || useNewGlibc {
 		_, cerr := RemoveAll(config)
 		if cerr != nil {
 			return cerr
@@ -209,7 +209,7 @@ func Init(reset bool, deppath string, useOldGlibc bool) *Error {
 			deppath = fmt.Sprintf("%s/dependency.tar.gz", sys.RootDir)
 		}
 		if !FileExist(deppath) {
-			if useOldGlibc {
+			if !useNewGlibc {
 				gen_url := fmt.Sprintf("%s/default.dependency.tar.gz", SETTING_URL)
 				fmt.Printf("Downloading default.dependency.tar.gz from %s\n", gen_url)
 				err = DirectDownloadFilefromGithub("dependency.tar.gz", gen_url, sys.RootDir)
@@ -271,7 +271,7 @@ func Init(reset bool, deppath string, useOldGlibc bool) *Error {
 	return nil
 }
 
-func Reset(useOldGlibc bool) *Error {
+func Reset(useNewGlibc bool) *Error {
 	currdir, err := GetConfigDir()
 	if err != nil {
 		return err
@@ -304,7 +304,7 @@ func Reset(useOldGlibc bool) *Error {
 		RemoveFile(deppath)
 	}
 
-	if useOldGlibc {
+	if !useNewGlibc {
 		gen_url := fmt.Sprintf("%s/default.dependency.tar.gz", SETTING_URL)
 		fmt.Printf("Downloading default.dependency.tar.gz from %s\n", gen_url)
 		err = DirectDownloadFilefromGithub("dependency.tar.gz", gen_url, sys.RootDir)

diff --git a/main.go b/main.go
@@ -49,14 +49,14 @@ func checkCompleteness() *Error {
 func main() {
 	var InitReset bool
 	var InitDep string
-	var InitUseOldGlibc bool
+	var InitUseNewGlibc bool
 	var initCmd = &cobra.Command{
 		Use:   "init",
 		Short: "init the lpmx itself",
 		Long:  "init command is the basic command of lpmx, which is used for initializing lpmx system",
 		Args:  cobra.ExactArgs(0),
 		Run: func(cmd *cobra.Command, args []string) {
-			err := Init(InitReset, InitDep, InitUseOldGlibc)
+			err := Init(InitReset, InitDep, InitUseNewGlibc)
 			if err != nil {
 				LOGGER.Fatal(err.Error())
 				return
@@ -70,7 +70,7 @@ func main() {
 	}
 	initCmd.Flags().BoolVarP(&InitReset, "reset", "r", false, "initialize by force(optional)")
 	initCmd.Flags().StringVarP(&InitDep, "dependency", "d", "", "dependency tar ball(optional)")
-	initCmd.Flags().BoolVarP(&InitUseOldGlibc, "use-old-glibc", "g", false, "use old glibc veresion(optional)")
+	initCmd.Flags().BoolVarP(&InitUseNewGlibc, "use-new-glibc", "g", false, "use new glibc veresion(optional)")
 
 	var ListName string
 	var listCmd = &cobra.Command{
@@ -974,14 +974,14 @@ func main() {
 		},
 	}
 
-	var ResetUseOldGlibc bool
+	var ResetUseNewGlibc bool
 	var resetCmd = &cobra.Command{
 		Use:   "reset",
 		Short: "reset dependencies",
 		Long:  "reset necessary libraries of lpmx",
 		Args:  cobra.ExactArgs(0),
 		Run: func(cmd *cobra.Command, args []string) {
-			err := Reset(ResetUseOldGlibc)
+			err := Reset(ResetUseNewGlibc)
 			if err != nil {
 				LOGGER.Error(err.Error())
 				return
@@ -990,7 +990,7 @@ func main() {
 			}
 		},
 	}
-	resetCmd.Flags().BoolVarP(&ResetUseOldGlibc, "use-old-glibc", "g", false, "use old glibc veresion(optional)")
+	resetCmd.Flags().BoolVarP(&ResetUseNewGlibc, "use-new-glibc", "g", false, "use new glibc veresion(optional)")
 
 	var versionCmd = &cobra.Command{
 		Use:   "version",