Skip to content

Commit

Permalink
remove deprecated "buildpkg" support
Browse files Browse the repository at this point in the history
  • Loading branch information
puxplaying committed Oct 2, 2022
1 parent 0f770b6 commit d7fed53
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 43 deletions.
9 changes: 4 additions & 5 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,16 +1,15 @@
# Maintainer: Georg Wagner <puxplaying_at_gmail_dot_com>

pkgname=autogit
pkgver=1.8.0
pkgrel=2
pkgdesc="Auto build, update, install PKGBUILDS from Github, Gitlab and AUR via makepkg, devtools, buildpkg, chrootbuild"
pkgver=1.8.1
pkgrel=1
pkgdesc="Auto build, update, install PKGBUILDS from Github, Gitlab and AUR via makepkg, devtools, chrootbuild"
arch=('any')
url="https://github.com/puxplaying/autogit"
license=('GPL3')
depends=('pacman' 'sudo' 'bash' 'curl' 'fzf')
makedepends=('git')
optdepends=('manjaro-tools-pkg: Needed for Manjaro clean chroot package building'
'manjaro-chrootbuild: Needed for Manjaro clean chroot package building'
optdepends=('manjaro-chrootbuild: Needed for Manjaro clean chroot package building'
'devtools: Needed for Arch Linux clean chroot package building')
backup=("etc/$pkgname/$pkgname.conf")
source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz")
Expand Down
26 changes: 4 additions & 22 deletions autogit
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ function conf_ver_upd() {
# Check if the local ".conf" needs to be merged with the new package ".conf"
# because code changes require it.
# Define a hard coded variable, which will be checked inside the ".conf file"
if [ "$CONFVER" == "1.8.0" ]; then
if [ "$CONFVER" == "1.8.1" ]; then
echo "Up to date configuration" &>/dev/null
else
clear
Expand Down Expand Up @@ -103,7 +103,7 @@ function onlinecheck() {
#
# Supported build options
function buildoptions() {
if [ "$var" == "4" ]; then
if [ "$var" == "3" ]; then
if $MBARG1 $MBARG2 $MBARG3 $MBARG4; then
rm -rf *.*.log* *.log &>/dev/null # remove log files
mv *.*.pkg.* "$DIR/$GITHUBBINARY" &>/dev/null # move built package
Expand Down Expand Up @@ -141,36 +141,18 @@ function buildoptions() {
ls
folder="$(printf '%q\n' "${PWD##*/}")"
cd ..
if buildpkg $ARG1 $ARG2 $ARG3 $ARG4 $ARG5 $ARG6 $folder; then
if sudo chrootbuild $MCARG1 $MCARG2 $MCARG3 $MCARG4 $MCARG5 $MCARG6 $folder; then
mv *.*.pkg.* "$DIR/$GITHUBBINARY" &>/dev/null
cd "$folder"
rm -rf *.*.log* *.log &>/dev/null
rm -rf *.*.tar.* *.zip *.deb &>/dev/null
mv /var/cache/manjaro-tools/pkg/$ARG2/$ARG5/*.*.pkg.* "$DIR/$GITHUBBINARY" &>/dev/null
find "$DIR/$GITHUBBINARY" -type d -exec paccache -v -r -k 1 -c {} \; # clean cache
setrepoadd=1
else
echo -e "$FAILEDBUILDMSG"
rm -rf $folder/PKGBUILD &>/dev/null
failedbuild=1
fi
else
if [ "$var" == "3" ]; then
ls
folder="$(printf '%q\n' "${PWD##*/}")"
cd ..
if sudo chrootbuild $MCARG1 $MCARG2 $MCARG3 $MCARG4 $MCARG5 $MCARG6 $folder; then
mv *.*.pkg.* "$DIR/$GITHUBBINARY" &>/dev/null
cd "$folder"
rm -rf *.*.log* *.log &>/dev/null
rm -rf *.*.tar.* *.zip *.deb &>/dev/null
find "$DIR/$GITHUBBINARY" -type d -exec paccache -v -r -k 1 -c {} \; # clean cache
setrepoadd=1
else
echo -e "$FAILEDBUILDMSG"
rm -rf $folder/PKGBUILD &>/dev/null
failedbuild=1
fi
fi
fi
fi
fi
Expand Down
21 changes: 5 additions & 16 deletions autogit.conf
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# instead, which if changed could be merged with a ".pacnew" file on package updates.
# Please only change this setting when merging a new configuration or when prompted!
#
CONFVER=1.8.0
CONFVER=1.8.1
#
# -----------------------|
# Set default update method:
Expand All @@ -45,14 +45,14 @@ UPDCHECK=1
# Arch "devtools" - Convenience way option:
# https://wiki.archlinux.org/title/DeveloperWiki:Building_in_a_clean_chroot#Convenience_way
# The first argument starts with one of the supported build scripts ("extra-x86_64-build" "multilib-build") etc.
# Edit the options and select "var=4" below to use it.
# Edit the options and select "var=3" below to use it.
MBARG1=multilib-build
MBARG2=-c
MBARG3=
MBARG4=
#
# Default Manjaro "chrootbuild" command for unstable,
# edit the options and select "var=3" below to use it.
# edit the options and select "var=2" below to use it.
# Default = "chrootbuild -b unstable -c -p"
MCARG1=-b
MCARG2=unstable
Expand All @@ -61,16 +61,6 @@ MCARG4=-m
MCARG5=-H
MCARG6=-p
#
# Default Manjaro "buildpkg" command for unstable,
# edit the options and select "var=2" below to use it.
# Default = "buildpkg -b unstable -cws -a x86_64 -p"
ARG1=-b
ARG2=unstable
ARG3=-cws
ARG4=-a
ARG5=multilib
ARG6=-p
#
# Default "makepkg" command, edit the options and select "var=1" below to use it.
# Defaul = "makepkg -s -r -c"
MARG1=-s
Expand All @@ -81,9 +71,8 @@ MARG5=
MARG6=
#
# Options:
# 4 = Arch "devtools" - Convenience way option #Customizeable
# 3 = Manjaro "chrootbuild" #Customizeable
# 2 = Manjaro "buildpkg" #Customizeable
# 3 = Arch "devtools" - Convenience way option #Customizeable
# 2 = Manjaro "chrootbuild" #Customizeable
# 1 = makepkg -src (makepkg only building) #Customizeable
# 0 = makepkg -srci (makepkg with installation)
#
Expand Down

0 comments on commit d7fed53

Please sign in to comment.