Browse Source
cmd: code fix for #905
cmd: code fix for #905
- routers/admin: add rewrite update hook operation - conf/locale: update locale file due to ini behavior changes - cmd/cert_stub.go: remove useless code - cmd/fix.go: no longer need fix command(at least now)release/v0.9
Unknwon
8 years ago
24 changed files with 106 additions and 283 deletions
-
9cmd/cert_stub.go
-
2cmd/dump.go
-
184cmd/fix.go
-
2cmd/serve.go
-
2cmd/update.go
-
5cmd/web.go
-
26conf/locale/locale_de-DE.ini
-
13conf/locale/locale_en-US.ini
-
7conf/locale/locale_es-ES.ini
-
25conf/locale/locale_fr-CA.ini
-
7conf/locale/locale_ja-JP.ini
-
7conf/locale/locale_lv-LV.ini
-
7conf/locale/locale_nl-NL.ini
-
28conf/locale/locale_ru-RU.ini
-
7conf/locale/locale_zh-CN.ini
-
7conf/locale/locale_zh-HK.ini
-
3gogs.go
-
2models/action.go
-
2models/publickey.go
-
29models/repo.go
-
4routers/admin/admin.go
-
2templates/.VERSION
-
5templates/admin/dashboard.tmpl
-
4templates/user/dashboard/feeds.tmpl
@ -1,184 +0,0 @@ |
|||
// Copyright 2014 The Gogs Authors. All rights reserved.
|
|||
// Use of this source code is governed by a MIT-style
|
|||
// license that can be found in the LICENSE file.
|
|||
|
|||
package cmd |
|||
|
|||
import ( |
|||
"bufio" |
|||
"fmt" |
|||
"io" |
|||
"io/ioutil" |
|||
"os" |
|||
"path" |
|||
"runtime" |
|||
"strings" |
|||
|
|||
"github.com/Unknwon/com" |
|||
"github.com/codegangsta/cli" |
|||
|
|||
"github.com/gogits/gogs/models" |
|||
"github.com/gogits/gogs/modules/setting" |
|||
) |
|||
|
|||
var CmdFix = cli.Command{ |
|||
Name: "fix", |
|||
Usage: "This command for upgrade from old version", |
|||
Action: runFix, |
|||
Subcommands: fixCommands, |
|||
Flags: []cli.Flag{}, |
|||
} |
|||
|
|||
func runFix(ctx *cli.Context) { |
|||
} |
|||
|
|||
var fixCommands = []cli.Command{ |
|||
{ |
|||
Name: "location", |
|||
Usage: "Change Gogs app location", |
|||
Description: `Command location fixes location change of Gogs |
|||
|
|||
gogs fix location <old Gogs path> |
|||
`, |
|||
Action: runFixLocation, |
|||
}, |
|||
} |
|||
|
|||
// rewriteAuthorizedKeys replaces old Gogs path to the new one.
|
|||
func rewriteAuthorizedKeys(sshPath, oldPath, newPath string) error { |
|||
fr, err := os.Open(sshPath) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
defer fr.Close() |
|||
|
|||
tmpPath := sshPath + ".tmp" |
|||
fw, err := os.Create(tmpPath) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
defer fw.Close() |
|||
|
|||
oldPath = "command=\"" + oldPath + " serv" |
|||
newPath = "command=\"" + newPath + " serv" |
|||
buf := bufio.NewReader(fr) |
|||
for { |
|||
line, errRead := buf.ReadString('\n') |
|||
line = strings.TrimSpace(line) |
|||
|
|||
if errRead != nil { |
|||
if errRead != io.EOF { |
|||
return errRead |
|||
} |
|||
|
|||
// Reached end of file, if nothing to read then break,
|
|||
// otherwise handle the last line.
|
|||
if len(line) == 0 { |
|||
break |
|||
} |
|||
} |
|||
|
|||
// Still finding the line, copy the line that currently read.
|
|||
if _, err = fw.WriteString(strings.Replace(line, oldPath, newPath, 1) + "\n"); err != nil { |
|||
return err |
|||
} |
|||
|
|||
if errRead == io.EOF { |
|||
break |
|||
} |
|||
} |
|||
|
|||
if err = os.Remove(sshPath); err != nil { |
|||
return err |
|||
} |
|||
return os.Rename(tmpPath, sshPath) |
|||
} |
|||
|
|||
func rewriteUpdateHook(path, appPath string) error { |
|||
if runtime.GOOS == "windows" { |
|||
rp := strings.NewReplacer("\\", "/") |
|||
appPath = "\"" + rp.Replace(appPath) + "\"" |
|||
} else { |
|||
rp := strings.NewReplacer("\\", "/", " ", "\\ ") |
|||
appPath = rp.Replace(appPath) |
|||
} |
|||
|
|||
if err := ioutil.WriteFile(path, []byte(fmt.Sprintf(models.TPL_UPDATE_HOOK, |
|||
setting.ScriptType, appPath)), os.ModePerm); err != nil { |
|||
return err |
|||
} |
|||
return nil |
|||
} |
|||
|
|||
func walkDir(rootPath, recPath, appPath string, depth int) error { |
|||
depth++ |
|||
if depth > 3 { |
|||
return nil |
|||
} else if depth == 3 { |
|||
if err := rewriteUpdateHook(path.Join(rootPath, "hooks/update"), appPath); err != nil { |
|||
return err |
|||
} |
|||
} |
|||
|
|||
dir, err := os.Open(rootPath) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
defer dir.Close() |
|||
|
|||
fis, err := dir.Readdir(0) |
|||
if err != nil { |
|||
return err |
|||
} |
|||
|
|||
for _, fi := range fis { |
|||
if strings.Contains(fi.Name(), ".DS_Store") { |
|||
continue |
|||
} |
|||
|
|||
relPath := path.Join(recPath, fi.Name()) |
|||
curPath := path.Join(rootPath, fi.Name()) |
|||
if fi.IsDir() { |
|||
if err = walkDir(curPath, relPath, appPath, depth); err != nil { |
|||
return err |
|||
} |
|||
} |
|||
} |
|||
return nil |
|||
} |
|||
|
|||
func runFixLocation(ctx *cli.Context) { |
|||
if len(ctx.Args()) != 1 { |
|||
fmt.Println("Incorrect arguments number, expect 1") |
|||
os.Exit(2) |
|||
} |
|||
|
|||
execPath, _ := setting.ExecPath() |
|||
|
|||
oldPath := ctx.Args().First() |
|||
fmt.Printf("Old location: %s\n", oldPath) |
|||
fmt.Println("This command should be executed in the new Gogs path") |
|||
fmt.Printf("Do you want to change Gogs app path from old location to:\n") |
|||
fmt.Printf("-> %s?\n", execPath) |
|||
fmt.Print("Press <enter> to continue, use <Ctrl+c> to exit.") |
|||
fmt.Scanln() |
|||
|
|||
// Fix in authorized_keys file.
|
|||
sshPath := path.Join(models.SSHPath, "authorized_keys") |
|||
if com.IsFile(sshPath) { |
|||
fmt.Printf("Fixing pathes in file: %s\n", sshPath) |
|||
if err := rewriteAuthorizedKeys(sshPath, oldPath, execPath); err != nil { |
|||
fmt.Println(err) |
|||
os.Exit(1) |
|||
} |
|||
} |
|||
|
|||
// Fix position in gogs-repositories.
|
|||
setting.NewConfigContext() |
|||
fmt.Printf("Fixing pathes in repositories: %s\n", setting.RepoRootPath) |
|||
if err := walkDir(setting.RepoRootPath, "", execPath, 0); err != nil { |
|||
fmt.Println(err) |
|||
os.Exit(1) |
|||
} |
|||
fmt.Println("Fix position finished!") |
|||
} |
|||
@ -1 +1 @@ |
|||
0.5.13.0207 Beta |
|||
0.5.13.0208 Beta |
|||
Write
Preview
Loading…
Cancel
Save
Reference in new issue