changes

Sineware · Sep 22, 2022 · ba1def7 · ba1def7
1 parent 22729f2
commit ba1def7
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 9 deletions.
diff --git a/src/apkbuild-parser/repo.ts b/src/apkbuild-parser/repo.ts
@@ -87,7 +87,7 @@ export const repository = new Map<string,Package>([
     ["kded", { name: "kded", repo: "https://invent.kde.org/frameworks/kded.git", aports_repo: "community"}],
     ["kdelibs4support", { name: "kdelibs4support", repo: "https://invent.kde.org/frameworks/kdelibs4support.git", aports_repo: "community"}],
     ["kdesignerplugin", { name: "kdesignerplugin", repo: "https://invent.kde.org/frameworks/kdesignerplugin.git", aports_repo: "community"}],
-    ["kdesu", { name: "kdesu", repo: "https://invent.kde.org/frameworks/kdesu.git", aports_repo: "community", extraDepends: ["plasma-workspace-dev"]}],
+    //["kdesu", { name: "kdesu", repo: "https://invent.kde.org/frameworks/kdesu.git", aports_repo: "community", extraDepends: ["plasma-workspace-dev"]}], // failing because apkindex references old packages
     ["kdnssd", { name: "kdnssd", repo: "https://invent.kde.org/frameworks/kdnssd.git", aports_repo: "community"}],
     ["kdoctools", { name: "kdoctools", repo: "https://invent.kde.org/frameworks/kdoctools.git", aports_repo: "community"}],
     ["kemoticons", { name: "kemoticons", repo: "https://invent.kde.org/frameworks/kemoticons.git", aports_repo: "community"}],

diff --git a/src/index.ts b/src/index.ts
@@ -121,14 +121,6 @@ async function buildPackage(pkg: Package) {
             console.log("📦 -> Not cloned, cloning");
         }
 
-        // clear old packages from ~/packages/prolinux-nightly/${ARCH}
-        console.log("📦 -> Clearing old packages");
-        // todo this matches wrong (breeze-* matches breeze-grub etc)
-        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-9999*`);
-        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-dev-9999*`);
-        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-libs-9999*`);
-        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-docs-9999*`);
-        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-lang-9999*`);
 
         console.log("🔧   -> Clone package repository");
         buildStep = `build-${pkg.name}-clone`;
@@ -175,6 +167,16 @@ async function buildPackage(pkg: Package) {
         exec(`cd ${pkgDir} && abuild prepare`);
         exec(`cd ${pkgDir} && abuild deps`);
         exec(`cd ${pkgDir} && abuild build`);
+
+        // clear old packages from ~/packages/prolinux-nightly/${ARCH}
+        console.log("📦 -> Clearing old packages");
+        // todo this matches wrong (breeze-* matches breeze-grub etc)
+        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-9999*`);
+        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-dev-9999*`);
+        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-libs-9999*`);
+        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-docs-9999*`);
+        exec(`rm -rfv ~/packages/prolinux-nightly/${ARCH}/${pkg.name}-lang-9999*`);
+
         exec(`cd ${pkgDir} && abuild rootpkg`);
         exec(`cd ${pkgDir} && abuild index`);
         exec(`cd ${pkgDir} && abuild undeps`);