From cbb8d68e0bbe26ee0082e1694172481be53c55bc Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jeremy@system76.com>
Date: Thu, 12 Mar 2020 20:31:38 -0600
Subject: [PATCH] Update pkgar
---
cook.sh | 4 ++--
pkgar | 2 +-
repo.sh | 8 ++++----
3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/cook.sh b/cook.sh
index 0911d2664..dfaa5851e 100755
--- a/cook.sh
+++ b/cook.sh
@@ -442,11 +442,11 @@ function op {
pkgar \
create \
--secret "${ROOT}/build/secret.key" \
- --file stage.pkg \
+ --file stage.pkgar \
stage
;;
unpkg)
- rm -fv stage.pkg
+ rm -fv stage.pkgar
;;
tar)
echo "name = \"$1\"" > "stage.toml"
diff --git a/pkgar b/pkgar
index 0b8522c86..4c5a1b026 160000
--- a/pkgar
+++ b/pkgar
@@ -1 +1 @@
-Subproject commit 0b8522c860af161f72075da4683c3856e1526ea1
+Subproject commit 4c5a1b026e30bff7babdc241b3a3d7f1875f0a55
diff --git a/repo.sh b/repo.sh
index 8c653bae7..19ebf960f 100755
--- a/repo.sh
+++ b/repo.sh
@@ -59,13 +59,13 @@ do
fi
fi
- if [ ! -f "recipes/$recipe/stage.pkg" ]
+ if [ ! -f "recipes/$recipe/stage.pkgar" ]
then
echo -e "\033[01;38;5;155mrepo - packaging $recipe\033[0m" >&2
./cook.sh "$recipe" pkg $DEBUG
else
TIME_STAGE="$($STAT -c "%Y" recipes/$recipe/stage.tar.gz)"
- TIME_PKG="$($STAT -c "%Y" recipes/$recipe/stage.pkg)"
+ TIME_PKG="$($STAT -c "%Y" recipes/$recipe/stage.pkgar)"
if [ "$TIME_STAGE" -gt "$TIME_PKG" ]
then
echo -e "\033[01;38;5;155mrepo - repackaging $recipe\033[0m" >&2
@@ -82,10 +82,10 @@ do
./cook.sh $recipe publish
fi
- if [ "recipes/$recipe/stage.pkg" -nt "$REPO/$recipe.pkg" ]
+ if [ "recipes/$recipe/stage.pkgar" -nt "$REPO/$recipe.pkgar" ]
then
echo -e "\033[01;38;5;155mrepo - publishing $recipe\033[0m" >&2
- cp -v "recipes/$recipe/stage.pkg" "$REPO/$recipe.pkg"
+ cp -v "recipes/$recipe/stage.pkgar" "$REPO/$recipe.pkgar"
fi
done
--
GitLab