Browse Source

fix script on macOS (fix #901)

Gildas 2 years ago
parent
commit
b6b4dfad00
3 changed files with 7 additions and 13 deletions
  1. 4 10
      build-extension.sh
  2. 1 1
      manifest.json
  3. 2 2
      src/core/bg/downloads.js

+ 4 - 10
build-extension.sh

@@ -26,30 +26,24 @@ mv package.copy.json package.json
 
 rm singlefile-extension-firefox.zip singlefile-extension-chromium.zip singlefile-extension-edge.zip
 cp manifest.json manifest.copy.json
-cp src/core/bg/downloads.js downloads.copy.js
-sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-h1220p1oasj3050kr5r416661adm091a/g' src/core/bg/downloads.js
-sed -i 's/000000000000000000000000/VQJ8Gq8Vxx72QyxPyeLtWvUt/g' src/core/bg/downloads.js
 
 cp src/core/bg/config.js config.copy.js
 cp src/core/bg/companion.js companion.copy.js
 jq "del(.options_page,.background.persistent,.optional_permissions[0],.permissions[2],.oauth2)" manifest.copy.json >manifest.json
-sed -i 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' src/core/bg/config.js
-sed -i 's/enabled: true/enabled: false/g' src/core/bg/companion.js
+sed -i "" 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' src/core/bg/config.js
+sed -i "" 's/enabled: true/enabled: false/g' src/core/bg/companion.js
 zip -r singlefile-extension-firefox.zip manifest.json lib _locales src
 mv config.copy.js src/core/bg/config.js
 mv companion.copy.js src/core/bg/companion.js
 
 jq "del(.browser_specific_settings,.permissions[0],.permissions[1],.options_ui.browser_style)" manifest.copy.json >manifest.json
-sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-7tjs1im1pighftpoepea2kvkubnfjj44/g' manifest.json
 zip -r singlefile-extension-chromium.zip manifest.json lib _locales src
 
 cp src/core/bg/config.js config.copy.js
 jq "del(.browser_specific_settings,.permissions[0],.permissions[1],.options_ui.browser_style)" manifest.copy.json >manifest.json
-sed -i 's/207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj/207618107333-7tjs1im1pighftpoepea2kvkubnfjj44/g' manifest.json
-sed -i 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' src/core/bg/config.js
-sed -i 's/image\/avif,//g' src/core/bg/config.js
+sed -i "" 's/forceWebAuthFlow: false/forceWebAuthFlow: true/g' src/core/bg/config.js
+sed -i "" 's/image\/avif,//g' src/core/bg/config.js
 zip -r singlefile-extension-edge.zip manifest.json lib _locales src
 mv config.copy.js src/core/bg/config.js
 
 mv manifest.copy.json manifest.json
-mv downloads.copy.js src/core/bg/downloads.js

+ 1 - 1
manifest.json

@@ -90,7 +90,7 @@
 		"src/ui/pages/editor-frame-web.css"
 	],
 	"oauth2": {
-		"client_id": "207618107333-3pj2pmelhnl4sf3rpctghs9cean3q8nj.apps.googleusercontent.com",
+		"client_id": "207618107333-7tjs1im1pighftpoepea2kvkubnfjj44.apps.googleusercontent.com",
 		"scopes": [
 			"https://www.googleapis.com/auth/drive.file"
 		]

+ 2 - 2
src/core/bg/downloads.js

@@ -37,8 +37,8 @@ import { download } from "./download-util.js";
 
 const partialContents = new Map();
 const MIMETYPE_HTML = "text/html";
-const GDRIVE_CLIENT_ID = "207618107333-h1220p1oasj3050kr5r416661adm091a.apps.googleusercontent.com"; // 3pj2pmelhnl4sf3rpctghs9cean3q8nj
-const GDRIVE_CLIENT_KEY = "VQJ8Gq8Vxx72QyxPyeLtWvUt"; // "000000000000000000000000";
+const GDRIVE_CLIENT_ID = "207618107333-7tjs1im1pighftpoepea2kvkubnfjj44.apps.googleusercontent.com";
+const GDRIVE_CLIENT_KEY = "VQJ8Gq8Vxx72QyxPyeLtWvUt";
 const SCOPES = ["https://www.googleapis.com/auth/drive.file"];
 const CONFLICT_ACTION_SKIP = "skip";
 const CONFLICT_ACTION_UNIQUIFY = "uniquify";