diff --git a/cook.sh b/cook.sh index 0911d2664909f7b402118e281b1b61a2f632acc5..dfaa5851e5a4081d7314d2de3240115da65dfc29 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 0b8522c860af161f72075da4683c3856e1526ea1..4c5a1b026e30bff7babdc241b3a3d7f1875f0a55 160000 --- a/pkgar +++ b/pkgar @@ -1 +1 @@ -Subproject commit 0b8522c860af161f72075da4683c3856e1526ea1 +Subproject commit 4c5a1b026e30bff7babdc241b3a3d7f1875f0a55 diff --git a/repo.sh b/repo.sh index 8c653bae7715418c61f7082d480661a05435d07b..19ebf960f183c73ff191d767ec6d63a62220bca8 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