[arch-commits] Commit in react-native-debugger/trunk (4 files)

Thu Apr 18 03:32:21 UTC 2019

Date: Thursday, April 18, 2019 @ 03:32:21
  Author: tensor5
Revision: 451969

upgpkg: react-native-debugger 0.9.7-2

Fix Content Security Policy error.

Added:
  react-native-debugger/trunk/react-native-debugger.sh
Modified:
  react-native-debugger/trunk/PKGBUILD
  react-native-debugger/trunk/react-native-debugger.js
Deleted:
  react-native-debugger/trunk/Content-Security-Policy.patch

-------------------------------+
 Content-Security-Policy.patch |   10 ----------
 PKGBUILD                      |   16 ++++++++--------
 react-native-debugger.js      |    4 ++--
 react-native-debugger.sh      |    7 +++++++
 4 files changed, 17 insertions(+), 20 deletions(-)

Deleted: Content-Security-Policy.patch
===================================================================

--- Content-Security-Policy.patch	2019-04-18 02:58:27 UTC (rev 451968)
+++ Content-Security-Policy.patch	2019-04-18 03:32:21 UTC (rev 451969)
@@ -1,10 +0,0 @@
---- a/dist/app.html
-+++ b/dist/app.html
-@@ -2,6 +2,7 @@
- <html>
-   <head>
-     <meta charset=utf-8>
-+    <meta http-equiv="Content-Security-Policy" content="script-src 'self'; style-src blob: 'self' 'unsafe-inline';">
-     <title>React Native Debugger</title>
-     <link href='css/style.css' rel="stylesheet" />
-   </head>

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-04-18 02:58:27 UTC (rev 451968)
+++ PKGBUILD	2019-04-18 03:32:21 UTC (rev 451969)
@@ -3,7 +3,7 @@
 pkgname=react-native-debugger
 pkgver=0.9.7
 _commit=6d05271a1f8c97ff7295a552c25618f49e2dbfbd
-pkgrel=1
+pkgrel=2
 pkgdesc='The standalone app for React Native Debugger, with React DevTools / Redux DevTools'
 arch=('any')
 url='https://github.com/jhen0409/react-native-debugger'
@@ -11,24 +11,23 @@
 depends=('electron')
 makedepends=('asar' 'git' 'npm')
 source=("git+https://github.com/jhen0409/react-native-debugger.git#commit=${_commit}"
-        'Content-Security-Policy.patch'
         'iconPath.patch'
         'nodeIntegration.patch'
         'react-native-debugger.desktop'
         'react-native-debugger.js'
+        'react-native-debugger.sh'
         'setZoomLevelLimits.patch')
 sha256sums=('SKIP'
-            '11695a30802fb9d559608f56abdd09d864b40311de310c08e084fa93abe39443'
             '4ac46fdbfe1658ea63f28b56ceda94b06324f8476090a0d0888f99ae43dd27ad'
             '6700efd069c5870edf0e4aa826a89860254c262f437761ec0c328273604bda83'
             'f63e79516db0feb2e76c366402cf266165c0f7eb282dc55703b800b91152867d'
-            '8cd406c3b2d091f2a2b73e5755682dc925bb1f75d0d425b82507136b350a4ceb'
+            '59e0c247d006a437a619917df7e76a506aadb4d751b7d3bb476a96030620a660'
+            '8a217b932b1042c14930d89f56661dbdc13b1afe04680df6b2fefceb242fb05c'
             '6853ab684f5eb39e32e0b75ead0cf19c0a883108888b003f0f80cfd07cb4f965')
 
 prepare() {
     cd ${pkgname}
 
-    patch -Np1 -i ../Content-Security-Policy.patch
     patch -Np1 -i ../iconPath.patch
     patch -Np1 -i ../nodeIntegration.patch
     patch -Np1 -i ../setZoomLevelLimits.patch
@@ -48,11 +47,12 @@
 package() {
     cd ${pkgname}
 
-    install -dm755 "${pkgdir}/usr/lib"
+    install -dm755 "${pkgdir}/usr/lib/${pkgname}"
     rm dist/logo.png  # see iconPath.patch
-    asar pack dist "${pkgdir}/usr/lib/${pkgname}.asar"
+    asar pack dist "${pkgdir}/usr/lib/${pkgname}/app.asar"
 
-    install -Dm755 ../${pkgname}.js "${pkgdir}/usr/bin/${pkgname}"
+    install -Dm755 ../${pkgname}.sh "${pkgdir}/usr/bin/${pkgname}"
+    install -m755 ../${pkgname}.js "${pkgdir}/usr/lib/${pkgname}/${pkgname}"
     install -Dm644 -t "${pkgdir}/usr/share/applications" ../${pkgname}.desktop
     install -Dm644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE.md
     install -Dm644 electron/logo.png \

Modified: react-native-debugger.js
===================================================================
--- react-native-debugger.js	2019-04-18 02:58:27 UTC (rev 451968)
+++ react-native-debugger.js	2019-04-18 03:32:21 UTC (rev 451969)
@@ -4,7 +4,7 @@
 
 const {app} = require("electron");
 const fs = require("fs");
-const {dirname, join} = require("path");
+const {join} = require("path");
 
 // Change command name.
 const fd = fs.openSync("/proc/self/comm", fs.constants.O_WRONLY);
@@ -15,7 +15,7 @@
 process.argv.splice(0, 1);
 
 // Set application paths.
-const appPath = join(dirname(__dirname), "lib", `${name}.asar`);
+const appPath = join(__dirname, "app.asar");
 const packageJson = require(join(appPath, "package.json"));
 const productName = packageJson.productName;
 app.setAppPath(appPath);

Added: react-native-debugger.sh
===================================================================
--- react-native-debugger.sh	                        (rev 0)
+++ react-native-debugger.sh	2019-04-18 03:32:21 UTC (rev 451969)
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+: ${ELECTRON_DISABLE_SECURITY_WARNINGS=1}
+
+export ELECTRON_DISABLE_SECURITY_WARNINGS
+
+exec /usr/lib/react-native-debugger/react-native-debugger

