From a5d5d987d288e0b6f98e4bcbb6bb3239cebba268 Mon Sep 17 00:00:00 2001
From: arctic-penguin <103587359+arctic-penguin@users.noreply.github.com>
Date: Thu, 23 Feb 2023 23:01:53 +0100
Subject: [PATCH] pacdef: support new version 1.x (#364)

---
 src/steps/os/linux.rs | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/steps/os/linux.rs b/src/steps/os/linux.rs
index 50946cca..3916ae6e 100644
--- a/src/steps/os/linux.rs
+++ b/src/steps/os/linux.rs
@@ -458,10 +458,28 @@ pub fn run_pacdef(ctx: &ExecutionContext) -> Result<()> {
 
     print_separator("pacdef");
 
-    ctx.run_type().execute(&pacdef).arg("sync").status_checked()?;
+    let output = ctx.run_type().execute(&pacdef).arg("version").output_checked()?;
+    let string = String::from_utf8(output.stdout)?;
+    let new_version = string.contains("version: 1");
 
-    println!();
-    ctx.run_type().execute(&pacdef).arg("review").status_checked()
+    if new_version {
+        ctx.run_type()
+            .execute(&pacdef)
+            .args(["package", "sync"])
+            .status_checked()?;
+
+        println!();
+        ctx.run_type()
+            .execute(&pacdef)
+            .args(["package", "review"])
+            .status_checked()?;
+    } else {
+        ctx.run_type().execute(&pacdef).arg("sync").status_checked()?;
+
+        println!();
+        ctx.run_type().execute(&pacdef).arg("review").status_checked()?;
+    }
+    Ok(())
 }
 
 pub fn run_pacstall(ctx: &ExecutionContext) -> Result<()> {