@joystick.js/cli-canary 0.0.0-canary.1439 → 0.0.0-canary.1440

package/dist/lib/development_server/databases/postgresql/installers/linux.js

@@ -1 +1 @@
-import{promisify as r}from"util";import{execFile as g}from"child_process";import t from"fs";import d from"os";import a from"path";const o=r(g),m=r(t.mkdir),y=r(t.symlink),l=r(t.access),_=async()=>{try{const p="/usr/lib/postgresql/16/bin",i=a.join(d.homedir(),".joystick","databases","postgresql","bin"),n=a.join(i,"bin"),c=a.join(n,"postgres");try{await l(c,t.constants.X_OK);return}catch{}process.loader.print("PostgreSQL not found. Installing... (this may take a few minutes)"),await o("sudo",["sh","-c",'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list']),await o("wget",["--quiet","-O","-","https://www.postgresql.org/media/keys/ACCC4CF8.asc","|","sudo","apt-key","add","-"]),await o("sudo",["apt-get","update"]),await o("sudo",["apt-get","install","-y","postgresql-16","postgresql-client-16","postgresql-server-dev-16"]),await m(i,{recursive:!0});try{await y(p,n)}catch(s){if(s.code!=="EEXIST")throw console.error("Error creating symlink:",s),s}try{await l(c,t.constants.X_OK)}catch(s){throw console.error("Error accessing PostgreSQL executable:",s),s}process.loader.print("PostgreSQL installed!")}catch(e){throw console.error("Error installing PostgreSQL:",e),e}};var k=_;export{k as default};
+import{promisify as o}from"util";import{execFile as g}from"child_process";import r from"fs";import m from"os";import e from"path";const a=o(g),d=o(r.mkdir),y=o(r.symlink),l=o(r.access),_=async()=>{try{const s="16",p=`/usr/lib/postgresql/${s}/bin`,i=e.join(m.homedir(),".joystick","databases","postgresql","bin"),n=e.join(i,"bin"),c=e.join(n,"postgres");try{await l(c,r.constants.X_OK);return}catch{}process.loader.print("PostgreSQL not found. Installing... (this may take a few minutes)"),await a("sudo",["sh","-c",'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list']),await a("sudo",["apt-get","update"]),await a("sudo",["apt-get","install","-y",`postgresql-${s}`,`postgresql-client-${s}`,`postgresql-server-dev-${s}`]),await d(i,{recursive:!0});try{await y(p,n)}catch(t){if(t.code!=="EEXIST")throw console.error("Error creating symlink:",t),t}try{await l(c,r.constants.X_OK)}catch(t){throw console.error("Error accessing PostgreSQL executable:",t),t}process.loader.print("PostgreSQL installed!")}catch(s){throw console.error("Error installing PostgreSQL:",s),s}};var k=_;export{k as default};

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@joystick.js/cli-canary",
   "type": "module",
-  "version": "0.0.0-canary.1439",
-  "canary_version": "0.0.0-canary.1438",
+  "version": "0.0.0-canary.1440",
+  "canary_version": "0.0.0-canary.1439",
   "description": "The CLI for Joystick.",
   "main": "dist/index.js",
   "bin": {

package/src/lib/development_server/databases/postgresql/installers/linux.js

@@ -29,11 +29,10 @@ const download_postgresql_linux = async () => {
     
     // Add PostgreSQL 16 repository
     await exec_file_async('sudo', ['sh', '-c', 'echo "deb http://apt.postgresql.org/pub/repos/apt $(lsb_release -cs)-pgdg main" > /etc/apt/sources.list.d/pgdg.list']);
-    await exec_file_async('wget', ['--quiet', '-O', '-', 'https://www.postgresql.org/media/keys/ACCC4CF8.asc', '|', 'sudo', 'apt-key', 'add', '-']);
     
     // Update package list and install PostgreSQL 16
     await exec_file_async('sudo', ['apt-get', 'update']);
-    await exec_file_async('sudo', ['apt-get', 'install', '-y', 'postgresql-16', 'postgresql-client-16', 'postgresql-server-dev-16']);
+    await exec_file_async('sudo', ['apt-get', 'install', '-y', `postgresql-${postgresql_version}`, `postgresql-client-${postgresql_version}`, `postgresql-server-dev-${postgresql_version}`]);
 
     await mkdir_async(joystick_bin_path, { recursive: true });