Skip to content
This repository was archived by the owner on May 27, 2023. It is now read-only.

Commit be19361

Browse files
change use-new-glibc code
1 parent c8bebb8 commit be19361

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed
32.5 KB
Binary file not shown.

container/container.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ func (server *RPC) RPCDelete(req Request, res *Response) error {
146146
return nil
147147
}
148148

149-
func Init(reset bool, deppath string, useOldGlibc bool) *Error {
149+
func Init(reset bool, deppath string, useNewGlibc bool) *Error {
150150
currdir, err := GetConfigDir()
151151
if err != nil {
152152
return err
@@ -155,7 +155,7 @@ func Init(reset bool, deppath string, useOldGlibc bool) *Error {
155155
config := fmt.Sprintf("%s/.lpmxsys", currdir)
156156

157157
//delete everything
158-
if reset || useOldGlibc {
158+
if reset || useNewGlibc {
159159
_, cerr := RemoveAll(config)
160160
if cerr != nil {
161161
return cerr
@@ -209,7 +209,7 @@ func Init(reset bool, deppath string, useOldGlibc bool) *Error {
209209
deppath = fmt.Sprintf("%s/dependency.tar.gz", sys.RootDir)
210210
}
211211
if !FileExist(deppath) {
212-
if useOldGlibc {
212+
if !useNewGlibc {
213213
gen_url := fmt.Sprintf("%s/default.dependency.tar.gz", SETTING_URL)
214214
fmt.Printf("Downloading default.dependency.tar.gz from %s\n", gen_url)
215215
err = DirectDownloadFilefromGithub("dependency.tar.gz", gen_url, sys.RootDir)
@@ -271,7 +271,7 @@ func Init(reset bool, deppath string, useOldGlibc bool) *Error {
271271
return nil
272272
}
273273

274-
func Reset(useOldGlibc bool) *Error {
274+
func Reset(useNewGlibc bool) *Error {
275275
currdir, err := GetConfigDir()
276276
if err != nil {
277277
return err
@@ -304,7 +304,7 @@ func Reset(useOldGlibc bool) *Error {
304304
RemoveFile(deppath)
305305
}
306306

307-
if useOldGlibc {
307+
if !useNewGlibc {
308308
gen_url := fmt.Sprintf("%s/default.dependency.tar.gz", SETTING_URL)
309309
fmt.Printf("Downloading default.dependency.tar.gz from %s\n", gen_url)
310310
err = DirectDownloadFilefromGithub("dependency.tar.gz", gen_url, sys.RootDir)

main.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -49,14 +49,14 @@ func checkCompleteness() *Error {
4949
func main() {
5050
var InitReset bool
5151
var InitDep string
52-
var InitUseOldGlibc bool
52+
var InitUseNewGlibc bool
5353
var initCmd = &cobra.Command{
5454
Use: "init",
5555
Short: "init the lpmx itself",
5656
Long: "init command is the basic command of lpmx, which is used for initializing lpmx system",
5757
Args: cobra.ExactArgs(0),
5858
Run: func(cmd *cobra.Command, args []string) {
59-
err := Init(InitReset, InitDep, InitUseOldGlibc)
59+
err := Init(InitReset, InitDep, InitUseNewGlibc)
6060
if err != nil {
6161
LOGGER.Fatal(err.Error())
6262
return
@@ -70,7 +70,7 @@ func main() {
7070
}
7171
initCmd.Flags().BoolVarP(&InitReset, "reset", "r", false, "initialize by force(optional)")
7272
initCmd.Flags().StringVarP(&InitDep, "dependency", "d", "", "dependency tar ball(optional)")
73-
initCmd.Flags().BoolVarP(&InitUseOldGlibc, "use-old-glibc", "g", false, "use old glibc veresion(optional)")
73+
initCmd.Flags().BoolVarP(&InitUseNewGlibc, "use-new-glibc", "g", false, "use new glibc veresion(optional)")
7474

7575
var ListName string
7676
var listCmd = &cobra.Command{
@@ -974,14 +974,14 @@ func main() {
974974
},
975975
}
976976

977-
var ResetUseOldGlibc bool
977+
var ResetUseNewGlibc bool
978978
var resetCmd = &cobra.Command{
979979
Use: "reset",
980980
Short: "reset dependencies",
981981
Long: "reset necessary libraries of lpmx",
982982
Args: cobra.ExactArgs(0),
983983
Run: func(cmd *cobra.Command, args []string) {
984-
err := Reset(ResetUseOldGlibc)
984+
err := Reset(ResetUseNewGlibc)
985985
if err != nil {
986986
LOGGER.Error(err.Error())
987987
return
@@ -990,7 +990,7 @@ func main() {
990990
}
991991
},
992992
}
993-
resetCmd.Flags().BoolVarP(&ResetUseOldGlibc, "use-old-glibc", "g", false, "use old glibc veresion(optional)")
993+
resetCmd.Flags().BoolVarP(&ResetUseNewGlibc, "use-new-glibc", "g", false, "use new glibc veresion(optional)")
994994

995995
var versionCmd = &cobra.Command{
996996
Use: "version",

0 commit comments

Comments
 (0)