pinokiod 3.2.182 → 3.2.185

package/kernel/bin/conda.js

@@ -298,6 +298,8 @@ create_default_packages:
         this.kernel.bin.path("miniconda", "python.exe"),
         this.kernel.bin.path("miniconda", "python3.exe"),
       )
+
+
     }
     ondata({ raw: `Install finished\r\n` })
     await this.kernel.bin.rm(installer, ondata)

package/kernel/bin/index.js

@@ -397,7 +397,7 @@ class Bin {
       // check brew_installed
       console.log("checking brew installed")
       let e = await this.kernel.bin.exists("homebrew")
-      let { stdout }= await this.kernel.bin.exec({ message: "xcode-select -p" }, (stream) => { })
+      let { stdout }= await this.exec({ message: "xcode-select -p" }, (stream) => { })
       let e2 = /(.*Library.*Developer.*CommandLineTools.*|.*Xcode.*Developer.*)/gi.test(stdout)
       let e3 = await this.kernel.exists("/Library/Developer/CommandLineTools")
 
@@ -408,7 +408,7 @@ class Bin {
       // - no
 
       let e4;
-      let result = await this.kernel.bin.exec({ message: "xcode-select --version" }, (stream) => { })
+      let result = await this.exec({ message: "xcode-select --version" }, (stream) => { })
       if (result && result.stdout) {
         e4 = /xcode-select version ([0-9]+)/gi.exec(result.stdout)
         if (e4 && e4.length > 1) {

package/package.json

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

package/server/index.js

@@ -2141,6 +2141,20 @@ class Server {
       } else {
       // update the py module if it's already installed
         console.log("not up to date")
+
+        // give full permission to pinokio folder on windows
+        if (this.kernel.platform === "win32") {
+          console.log("Give full permission")
+          await this.kernel.bin.exec({
+            sudo: true,
+            message: `icacls ${this.kernel.homedir} /grant Users:(OI)(CI)F /T`
+          }, (stream) => {
+            ondata(stream)
+          })
+          console.log("Give full permission done")
+        }
+
+
         await new Promise((resolve, reject) => {
           let interval = setInterval(async () => {
             console.log("checking mod.py")
@@ -2621,6 +2635,9 @@ class Server {
           if (item.icon) {
             item.icon = `/api/${req.params.name}/${item.icon}?raw=true`
           }
+          if (!item.href.startsWith("http")) {
+            item.href = path.resolve(this.kernel.homedir, "api", req.params.name, item.href)
+          }
         })
         let env = await Environment.get2(p2, this.kernel)
         res.render("pre", {

package/server/views/pre.ejs

@@ -58,10 +58,6 @@ h1 {
 .item .title {
   font-weight: bold;
 }
-.item .btn {
-  width: 50px;
-  text-align: center;
-}
 .item img {
   width: 100px;
 }
@@ -97,6 +93,17 @@ footer a.btn {
   box-sizing: border-box;
   width: 100%;
 }
+.item .btn i {
+  margin-right: 5px;
+}
+.item .btn {
+  margin-top: 10px;
+  text-align: center;
+  display: flex;
+  align-items: center;
+  padding: 10px 20px;
+  display: inline-block;
+}
 </style>
 </head>
 <body class='columns <%=theme%>'>
@@ -118,8 +125,15 @@ footer a.btn {
             <div class='col'>
               <div class='title'><%=item.title%></div>
               <div class='description'><%=item.description%></div>
+              <% if (item.href.startsWith("http")) { %>
+                <a target="_blank" features="browser" href='<%=item.href%>' class='btn'><i class="fa-solid fa-square-arrow-up-right"></i> Get</a>
+              <% } else { %>
+                <button class='btn' data-filepath="<%=item.href%>"><i class="fa-solid fa-square-arrow-up-right"></i> Get</button>
+              <% } %>
             </div>
+            <!--
             <a target="_blank" features="browser" href='<%=item.href%>' class='btn'>Get</a>
+            -->
           </div>
         <% } else if (item.env) { %>
         <!--
@@ -136,7 +150,7 @@ footer a.btn {
       <% }) %>
     </div>
     <footer>
-      <a class='btn' href="/env/api/<%=name%>?init=true">Done</a>
+      <a class='btn' href="/env/api/<%=name%>?init=true">Next</a>
     </footer>
   </main>
 </body>