修正 git 指令順序

gnehs · Aug 12, 2018 · 81e92e2 · 81e92e2
1 parent 81919cf
commit 81e92e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/index.js b/index.js
@@ -31,8 +31,8 @@ git
         if (branch != (config.PokaPlayer.debug ? 'dev' : 'master')) {
             git
                 .fetch(["--all"])
-                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(() => git.reset(["--hard", "origin/" + (config.PokaPlayer.debug ? 'dev' : 'master')]))
+                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(process.exit)
                 .catch(err => {
                     console.error('failed: ', err)
@@ -125,8 +125,8 @@ io.on('connection', socket => {
             git
                 .fetch(["--all"])
                 .then(() => socket.emit('git', 'fetch'))
-                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(() => git.reset(["--hard", "origin/" + (config.PokaPlayer.debug ? 'dev' : 'master')]))
+                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(() => socket.emit('git', 'reset'))
                 .then(() => socket.emit('restart'))
                 .then(() => process.exit())
@@ -146,8 +146,8 @@ app.get('/upgrade', (req, res) => {
         if (!config.PokaPlayer.instantUpgradeProcess) {
             git
                 .fetch(["--all"])
-                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(() => git.reset(["--hard", "origin/" + (config.PokaPlayer.debug ? 'dev' : 'master')]))
+                .then(() => git.checkout(config.PokaPlayer.debug ? 'dev' : 'master'))
                 .then(() => res.send('upgrade'))
                 .then(() => process.exit())
                 .catch(err => {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "pokaplayer",
-    "version": "0.6.4",
+    "version": "0.6.5",
     "description": "",
     "main": "index.js",
     "scripts": {