pinokiod 1.3.99 → 2.0.1

package/kernel/api/cloudflare/index.js

@@ -16,8 +16,6 @@ class C {
       => cloudflared tunnel --url http://localhost:8080
     */
 
-    console.log("*tunnel", req.params)
-
     let pipe_uri
     if (req.params.passcode) {
       // 1. start a pipe server => needed for authentication

package/kernel/environment.js

@@ -1,6 +1,8 @@
 const path = require('path')
+const os = require('os')
 const fs = require('fs')
 const Util = require('./util')
+const platform = os.platform()
 const ENVS = [{
   type: ["system"],
   key: "HOMEBREW_CACHE",
@@ -163,7 +165,7 @@ const ENVS = [{
 }, {
   type: ["system"],
   key: "PINOKIO_PORT",
-  val: "80",
+  val: (platform === "linux" ? "42000" : "80"),
   comment: [
     "##########################################################################",
     "#",
@@ -293,11 +295,9 @@ const init_folders = async (homedir) => {
 
 // Get the actual environment variable at specific path
 const get2 = async (filepath, kernel) => {
-  console.log("Get2")
   let api_path = Util.api_path(filepath, kernel)
   let default_env = await get(kernel.homedir)
   let api_env = await get(api_path)
-  console.log({ api_path, default_env, api_env, process_env: process.env })
   let current_env = Object.assign({}, process.env, default_env, api_env)
   return current_env
 }

package/kernel/util.js

@@ -87,7 +87,6 @@ const escapeStringRegexp = (string) => {
 }
 
 const update_env = async (filepath, changes) => {
-  console.log("update_env", { filepath, changes })
   const env = await fs.promises.readFile(filepath, "utf8")
   let append = false;
   const newval = Object.keys(changes).reduce((result, varname) => {
@@ -96,7 +95,6 @@ const update_env = async (filepath, changes) => {
     .replace(returnPattern, returnReplacement)
     .trim();
     const safeName = escapeStringRegexp(varname);
-    console.log({ value, safeName, result, varname })
     const varPattern = new RegExp(`^(${h}*${safeName}${h}*=${h}*)\\S*(${h}*)$`, "gm");
     if (varPattern.test(result)) {
       const safeValue = value.replace(groupPattern, groupReplacement);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pinokiod",
-  "version": "1.3.99",
+  "version": "2.0.1",
   "description": "",
   "main": "index.js",
   "scripts": {

package/script/index.js

@@ -1,5 +1,7 @@
 const path = require('path')
 const fs = require('fs')
+const os = require('os')
+const platform = os.platform()
 const Server = require('../server')
 class Store {
   set(key, val) {
@@ -36,7 +38,7 @@ class Store {
 }
 const server = new Server({
   //port: 42000,
-  port: 80,
+  port: (platform === "linux" ? 42000 : 80),
   agent: "web",
   store: new Store()
 })

package/server/index.js

@@ -1993,7 +1993,6 @@ class Server {
     //let home = this.kernel.homedir
     let home = this.kernel.store.get("home")
     this.app.get("/", async (req, res) => {
-      console.log("req", req)
       if (req.query.mode !== "settings" && !home) {
         res.redirect("/?mode=settings")
         return