feat: update/reinstall/uninstall

Signed-off-by: uiuing <uiuing@foxmail.com>
uiuing · Sep 7, 2022 · f781510 · f781510
1 parent 39fb227
commit f781510
Show file tree

Hide file tree

Showing 39 changed files with 708 additions and 159 deletions.
diff --git a/ingop/.eslintrc b/ingop/.eslintrc
@@ -28,6 +28,7 @@
     "react/react-in-jsx-scope": "off",
     "react-hooks/exhaustive-deps": "off",
     "react/jsx-no-useless-fragment": "off",
-    "react/require-default-props": "off"
+    "react/require-default-props": "off",
+    "react/no-array-index-key": "off"
   }
 }
diff --git a/ingop/main/index.ts b/ingop/main/index.ts
@@ -29,7 +29,7 @@ app.on('ready', async () => {
       ).toString()
 
   await mainWindow.loadURL(url)
-
+  if (isDev) mainWindow.webContents.openDevTools()
   const gotTheLock = app.requestSingleInstanceLock()
   if (!gotTheLock) {
     app.quit()

diff --git a/ingop/main/ipc/index.ts b/ingop/main/ipc/index.ts
@@ -2,7 +2,6 @@ import { ipcMain, shell } from 'electron'
 
 import {
   AutoSaveFile,
-  compile,
   envManage,
   existsAllEnv,
   ingopHome,
@@ -33,8 +32,6 @@ ipcMain.handle(
     new AutoSaveFile(fileData).env.go()
 )
 
-ipcMain.handle('compile-gop', async () => compile.gop())
-
 ipcMain.handle('env-gop-init', () => {
   envManage.initGop()
 })

diff --git a/ingop/main/ipc/methods.ts b/ingop/main/ipc/methods.ts
@@ -5,17 +5,11 @@ import { join } from 'path'
 
 import { execCommand, existsEnv } from '../methods/check'
 import { ingopPaths, ingopPathsArray, isWin } from '../methods/config'
-import { buildGop } from '../methods/env/compile'
 import { EnvManage } from '../methods/env/types'
 import { envManage as unixEnvManage } from '../methods/env/unix/execute'
 import { envManage as winEnvManage } from '../methods/env/win/execute'
 import { initDirs, removeDirs, saveFile } from '../methods/files'
-import {
-  Compile,
-  ExistsAllEnvParams,
-  ExistsAllEnvResult,
-  FileDataParams
-} from './types'
+import { ExistsAllEnvParams, ExistsAllEnvResult, FileDataParams } from './types'
 
 export const ingopHome = {
   init: () => {
@@ -59,14 +53,12 @@ export async function existsAllEnv(
     if (iv) {
       r.env.go.isNew = iv
       i = await existsEnv.gop.exist()
-      if (i.e) {
-        r.gop.exist = i.e
-        r.gop.version = i.v
-        iv = await existsEnv.gop.isNew(p.gopNewVersion)
-        r.gop.isIngop = await existsEnv.env.go.isIngop()
-        if (iv) {
-          r.gop.isNew = true
-        }
+      r.gop.exist = i.e
+      r.gop.version = i.v
+      iv = await existsEnv.gop.isNew(p.gopNewVersion)
+      r.gop.isIngop = await existsEnv.env.go.isIngop()
+      if (iv) {
+        r.gop.isNew = true
       }
     }
   }
@@ -107,10 +99,6 @@ export class AutoSaveFile {
   }
 }
 
-export const compile: Compile = {
-  gop: async (): Promise<boolean> => buildGop()
-}
-
 export const envManage: EnvManage = isWin ? winEnvManage : unixEnvManage
 
 export function rebootWindows() {

diff --git a/ingop/main/ipc/types.ts b/ingop/main/ipc/types.ts
@@ -25,7 +25,3 @@ export type ExistsAllEnvResult = {
     arch: string
   }
 }
-
-export type Compile = {
-  gop: () => Promise<boolean>
-}
diff --git a/ingop/main/methods/__test__/compile_env.test.ts b/ingop/main/methods/__test__/compile_env.test.ts
diff --git a/ingop/main/methods/check/index.ts b/ingop/main/methods/check/index.ts
@@ -41,12 +41,8 @@ async function isNewVersion(cmd: string, newVersion: string): AsyncBoolean {
 export const existsEnv: ExistsEnv = {
   gop: {
     exist: async () => {
-      let v = await checkVersionEnv('gop')
-      let e = v !== ''
-      if (!e) {
-        v = await checkVersionEnv(join(ingopPaths.gopBin, 'gop'))
-        e = v !== ''
-      }
+      const v = await checkVersionEnv('gop')
+      const e = v !== ''
       return { e, v }
     },
     isNew: async (newVersion: string) => isNewVersion('gop', newVersion),

diff --git a/ingop/main/methods/env/compile.ts b/ingop/main/methods/env/compile.ts
diff --git a/ingop/main/methods/env/unix/env/gop.bash b/ingop/main/methods/env/unix/env/gop.bash
@@ -18,7 +18,13 @@
 #
 # ----------------------------------------------------------------------------
 
-# Change the environment variables for GO+ in the registry
+if ! ping -c 1 -W 3 google.com > /dev/null; then
+  export GO111MODULE=on
+  export GOPROXY="https://goproxy.cn,direct"
+fi
+
+cd $HOME/.ingop/gop
+go run cmd/make.go --build || $HOME/.ingop/env/go/bin/go run cmd/make.go --build
 
 # Check two common environment variable profiles
 env_profiles=("$HOME"/.bash_profile )

diff --git a/ingop/main/methods/env/win/env/gop.bat b/ingop/main/methods/env/win/env/gop.bat
@@ -16,7 +16,16 @@
 ::
 :: ----------------------------------------------------------------------------
 
-:: Change the environment variables for GO in the registry
+
+ping google.com -n 1 -w 3 > nul
+if not %errorlevel% leq 0 (
+    set GO111MODULE=on
+    set GOPROXY=https://goproxy.cn,direct
+)
+
+cd %USERPROFILE%\.ingop\gop
+
+go run cmd/make.go --build || "%USERPROFILE%\.ingop\env\go\bin\go" run cmd/make.go --build
 
 @echo off
 set USERregpath=HKEY_CURRENT_USER\Environment

diff --git a/ingop/package.json b/ingop/package.json
@@ -14,6 +14,7 @@
     "build": "npm run build-renderer && npm run build-electron",
     "pack-app": "npm run build && electron-builder --dir",
     "dist": "npm run build && electron-builder",
+    "dist-win": "npm run build && electron-builder  build  --win --x64",
     "type-check": "tsc -p ./renderer/tsconfig.json && tsc -p main/tsconfig.json",
     "lint": "npm run prettier && npm run lint:eslint && npm run lint:stylelint",
     "prettier": "prettier --write 'renderer/**/*.{html,ts,js,tsx,jsx,css,json}' 'main/**/*.{ts,js}'",
@@ -58,6 +59,7 @@
     "react-dom": "^18.2.0",
     "react-helmet": "^6.1.0",
     "react-i18next": "^11.18.4",
+    "react-markdown": "^8.0.3",
     "react-router-dom": "^6.3.0",
     "recoil": "^0.7.5",
     "rimraf": "^3.0.2",