1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
|
Author: Andreas Tille <tille@debian.org>
Last-Update: Fri, 24 Mar 2017 12:58:02 +0100
Description: Use Debian packages nodejs, npm and pandoc
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -33,7 +33,7 @@
OUTPUT_FILE "${CMAKE_CURRENT_BINARY_DIR}/VERSION")
add_subdirectory(src)
-add_subdirectory(external/pandoc)
+#add_subdirectory(external/pandoc)
install(DIRECTORY assets
samples
@@ -42,7 +42,6 @@
ext
lib
manual.test
- node_modules
python
R
scripts
@@ -54,9 +53,7 @@
# Configure and assemble /bin directory.
configure_file(bin/deploy-example.in bin/deploy-example)
-install(PROGRAMS bin/node
- bin/npm
- bin/shiny-server
+install(PROGRAMS bin/shiny-server
"${CMAKE_CURRENT_BINARY_DIR}/bin/deploy-example"
DESTINATION shiny-server/bin)
--- a/lib/main.js
+++ b/lib/main.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/node
/*
* main.js
*
--- a/tools/makedocs.js
+++ b/tools/makedocs.js
@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/node
/*
* makedocs.js
--- a/lib/worker/app-worker.js
+++ b/lib/worker/app-worker.js
@@ -539,7 +539,7 @@
shinyServerVersion: SHINY_SERVER_VERSION,
workerId: workerId,
mode: appSpec.settings.mode,
- pandocPath: paths.projectFile("ext/pandoc"),
+ pandocPath: paths.projectFile("/usr/bin/pandoc"),
logFilePath: logFile !== null && logFile !== void 0 ? logFile : "",
disableProtocols: appSpec.settings.appDefaults.disableProtocols,
reconnect: appSpec.settings.appDefaults.reconnect,
--- a/lib/worker/app-worker.ts
+++ b/lib/worker/app-worker.ts
@@ -571,7 +571,7 @@
shinyServerVersion: SHINY_SERVER_VERSION,
workerId,
mode: appSpec.settings.mode,
- pandocPath: paths.projectFile("ext/pandoc"),
+ pandocPath: paths.projectFile("/usr/bin/pandoc"),
logFilePath: logFile ?? "",
disableProtocols: appSpec.settings.appDefaults.disableProtocols,
reconnect: appSpec.settings.appDefaults.reconnect,
--- a/test/app-worker.js
+++ b/test/app-worker.js
@@ -348,7 +348,7 @@
shinyServerVersion: SHINY_SERVER_VERSION,
workerId,
mode: "shiny",
- pandocPath: paths.projectFile("ext/pandoc"),
+ pandocPath: paths.projectFile("/usr/bin/pandoc"),
logFilePath,
disableProtocols: ["websocket", "xhr-streaming"],
reconnect: true,
|
