fix(ext/pkgx): migrate to pkgx 2

tsirysndr · tsirysndr · commit bd05620a7df8 · 2025-01-15T22:57:41.000+03:00
diff --git a/crates/ext/src/pkgx.rs b/crates/ext/src/pkgx.rs
@@ -41,7 +41,7 @@ impl Extension for Pkgx {
             return Ok(ExitStatus::default());
         }
 
-        let cmd = format!("eval \"$(pkgx --shellcode)\"; {}", cmd);
+        let cmd = format!("eval \"$(pkgx --shellcode)\" && pkgx^1 deintegrate && pkgx dev integrate ; {}", cmd);
         exec(&cmd, tx, out, last_cmd, work_dir)
     }
 
@@ -62,9 +62,9 @@ impl Extension for Pkgx {
         child.wait()?;
 
         Ok(())
-    }
+    }integratu
 
     fn format_command(&self, cmd: &str) -> String {
-        format!("eval \"$(pkgx --shellcode)\"; {}", cmd)
+        format!("eval \"$(pkgx --shellcode)\" && pkgx^1 deintegrate && pkgx dev integrate ; {}", cmd)
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ impl Extension for Pkgx {`
`41`	`41`	`return Ok(ExitStatus::default());`
`42`	`42`	`}`
`43`	`43`
`44`		`- let cmd = format!("eval \"$(pkgx --shellcode)\"; {}", cmd);`
	`44`	`+ let cmd = format!("eval \"$(pkgx --shellcode)\" && pkgx^1 deintegrate && pkgx dev integrate ; {}", cmd);`
`45`	`45`	`exec(&cmd, tx, out, last_cmd, work_dir)`
`46`	`46`	`}`
`47`	`47`
`@@ -62,9 +62,9 @@ impl Extension for Pkgx {`
`62`	`62`	`child.wait()?;`
`63`	`63`
`64`	`64`	`Ok(())`
`65`		`- }`
	`65`	`+ }integratu`
`66`	`66`
`67`	`67`	`fn format_command(&self, cmd: &str) -> String {`
`68`		`- format!("eval \"$(pkgx --shellcode)\"; {}", cmd)`
	`68`	`+ format!("eval \"$(pkgx --shellcode)\" && pkgx^1 deintegrate && pkgx dev integrate ; {}", cmd)`
`69`	`69`	`}`
`70`	`70`	`}`