Issue localed: We should not mix the aur repositories and the github repositories. The proposed architecture has proven to be more problematic than expected. Reverting to the old functional one, while keeping the lastest PR.
This commit is contained in:
Zeioth
parent
055871ec7a
commit
e2113b4b64
9 changed files with 3 additions and 227 deletions
|
|
@ -1,19 +0,0 @@
|
||||||
pkgbase = wofi-calc-git
|
|
||||||
pkgdesc = A simple calculator for wofi, inspired in rofi-calc.
|
|
||||||
pkgver = 1.0.r3.7e6ecfa
|
|
||||||
pkgrel = 1
|
|
||||||
url = https://github.com/Zeioth/wofi-calc.git
|
|
||||||
arch = any
|
|
||||||
license = MIT
|
|
||||||
makedepends = wofi
|
|
||||||
makedepends = libqalculate
|
|
||||||
depends = wofi
|
|
||||||
depends = libqalculate
|
|
||||||
provides = wofi-calc-git
|
|
||||||
provides = wofi-calc
|
|
||||||
conflicts = wofi-calc-git
|
|
||||||
conflicts = wofi-calc
|
|
||||||
source = https://raw.githubusercontent.com/Zeioth/wofi-calc/master/wofi-calc.sh
|
|
||||||
sha256sums = 0bc4930e7df685389309198ce214ebf3b88aee71ca0198f586ff0afe6bea716b
|
|
||||||
|
|
||||||
pkgname = wofi-calc-git
|
|
||||||
|
|
@ -1,35 +0,0 @@
|
||||||
pkgname=wofi-calc-git
|
|
||||||
pkgver=1.0.r3.7e6ecfa
|
|
||||||
pkgrel=1
|
|
||||||
epoch=
|
|
||||||
pkgdesc="A simple calculator for wofi, inspired in rofi-calc."
|
|
||||||
arch=(any)
|
|
||||||
url="https://github.com/Zeioth/wofi-calc.git"
|
|
||||||
license=('MIT')
|
|
||||||
groups=()
|
|
||||||
depends=(wofi libqalculate)
|
|
||||||
makedepends=(wofi libqalculate)
|
|
||||||
checkdepends=()
|
|
||||||
optdepends=()
|
|
||||||
provides=(wofi-calc-git wofi-calc)
|
|
||||||
conflicts=(wofi-calc-git wofi-calc)
|
|
||||||
replaces=()
|
|
||||||
backup=()
|
|
||||||
options=()
|
|
||||||
install=
|
|
||||||
changelog=
|
|
||||||
source=("https://raw.githubusercontent.com/Zeioth/wofi-calc/master/wofi-calc.sh")
|
|
||||||
noextract=()
|
|
||||||
sha256sums=('0bc4930e7df685389309198ce214ebf3b88aee71ca0198f586ff0afe6bea716b')
|
|
||||||
validpgpkeys=()
|
|
||||||
|
|
||||||
pkgver() {
|
|
||||||
cd "${_pkgname}"
|
|
||||||
printf "1.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
|
|
||||||
}
|
|
||||||
|
|
||||||
package() {
|
|
||||||
# Note: 'install' is a chmod+cp one-liner command by GNU
|
|
||||||
mkdir -p "$pkgdir"/usr/bin
|
|
||||||
install -m 555 "${srcdir}"/wofi-calc.sh "$pkgdir"/usr/bin/wofi-calc
|
|
||||||
}
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
# Description: Generates a new aur release.
|
|
||||||
# WARNING: If this script fail, run the next command. If you cannot clone it means
|
|
||||||
# You have permission errors, or most likely, you exceeded the AUR daily quota.
|
|
||||||
#
|
|
||||||
# git clone ssh://aur.archlinux.org/wofi-calc-git.git
|
|
||||||
|
|
||||||
# Generate the checksums automatically
|
|
||||||
sed -i "s/^sha256sums=.*/$(makepkg -g -f -p PKGBUILD)/" ./PKGBUILD
|
|
||||||
|
|
||||||
# Generate pagkage metadata
|
|
||||||
makepkg --printsrcinfo > ./.SRCINFO
|
|
||||||
|
|
||||||
# Push it to AUR
|
|
||||||
git add ./PKGBUILD ./.SRCINFO
|
|
||||||
git commit -m "New version"
|
|
||||||
git push ssh://aur@aur.archlinux.org/wofi-calc-git.git master
|
|
||||||
|
|
||||||
# Bye
|
|
||||||
echo -e "\n-------------------------------------------------------------------"
|
|
||||||
echo -e "NEW VERSION GENERATED\n"
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
RESULT_FILE="$HOME/.config/qalculate/qalc.result.history"
|
|
||||||
if [ ! -f "$RESULT_FILE" ]; then
|
|
||||||
touch $RESULT_FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
LAST_WOFI=""
|
|
||||||
QALC_RET=""
|
|
||||||
while :
|
|
||||||
do
|
|
||||||
qalc_hist=`tac $RESULT_FILE | head -1000`
|
|
||||||
WOFI_RET=`wofi --sort-order=default --cache-file=/dev/null -d -p calc <<< "$qalc_hist"`
|
|
||||||
|
|
||||||
rtrn=$?
|
|
||||||
|
|
||||||
if test "$rtrn" = "0"; then
|
|
||||||
if [[ "$WOFI_RET" =~ .*=.* ]]; then
|
|
||||||
RESULT=`echo "$WOFI_RET" | awk {'print $NF'}`
|
|
||||||
wl-copy "$RESULT"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
QALC_RET=`qalc "$WOFI_RET"`
|
|
||||||
LAST_WOFI=$WOFI_RET
|
|
||||||
echo $QALC_RET >> $RESULT_FILE
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ ! -z "$LAST_WOFI" ]; then
|
|
||||||
RESULT=`qalc -t "$LAST_WOFI"`
|
|
||||||
wl-copy "$RESULT"
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
pkgbase = wofi-calc-git
|
|
||||||
pkgdesc = A simple calculator for wofi, inspired in rofi-calc.
|
|
||||||
pkgver = 1.0.r3.7e6ecfa
|
|
||||||
pkgrel = 1
|
|
||||||
url = https://github.com/Zeioth/wofi-calc.git
|
|
||||||
arch = any
|
|
||||||
license = MIT
|
|
||||||
makedepends = wofi
|
|
||||||
makedepends = libqalculate
|
|
||||||
depends = wofi
|
|
||||||
depends = libqalculate
|
|
||||||
provides = wofi-calc-git
|
|
||||||
provides = wofi-calc
|
|
||||||
conflicts = wofi-calc-git
|
|
||||||
conflicts = wofi-calc
|
|
||||||
source = https://raw.githubusercontent.com/Zeioth/wofi-calc/master/wofi-calc.sh
|
|
||||||
sha256sums = 0bc4930e7df685389309198ce214ebf3b88aee71ca0198f586ff0afe6bea716b
|
|
||||||
|
|
||||||
pkgname = wofi-calc-git
|
|
||||||
|
|
@ -1,36 +0,0 @@
|
||||||
pkgname=wofi-calc
|
|
||||||
pkgver=1.0
|
|
||||||
pkgrel=1
|
|
||||||
epoch=
|
|
||||||
pkgdesc="A simple calculator for wofi, inspired in rofi-calc."
|
|
||||||
arch=(any)
|
|
||||||
url="https://github.com/Zeioth/wofi-calc.git"
|
|
||||||
license=('MIT')
|
|
||||||
groups=()
|
|
||||||
depends=(wofi libqalculate)
|
|
||||||
makedepends=(wofi libqalculate)
|
|
||||||
checkdepends=()
|
|
||||||
optdepends=()
|
|
||||||
provides=(wofi-calc-git wofi-calc)
|
|
||||||
conflicts=(wofi-calc-git wofi-calc)
|
|
||||||
replaces=()
|
|
||||||
backup=()
|
|
||||||
options=()
|
|
||||||
install=
|
|
||||||
changelog=
|
|
||||||
source=("https://raw.githubusercontent.com/Zeioth/wofi-calc/master/wofi-calc.sh")
|
|
||||||
noextract=()
|
|
||||||
sha256sums=('0bc4930e7df685389309198ce214ebf3b88aee71ca0198f586ff0afe6bea716b')
|
|
||||||
validpgpkeys=()
|
|
||||||
|
|
||||||
pkgver() {
|
|
||||||
cd "${_pkgname}"
|
|
||||||
printf "1.0.r%s" "$(git rev-list --count --tags)"
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
package() {
|
|
||||||
# Note: 'install' is a chmod+cp one-liner command by GNU
|
|
||||||
mkdir -p "$pkgdir"/usr/bin
|
|
||||||
install -m 555 "${srcdir}"/wofi-calc.sh "$pkgdir"/usr/bin/wofi-calc
|
|
||||||
}
|
|
||||||
|
|
@ -1,27 +0,0 @@
|
||||||
# Description: Generates a new aur release.
|
|
||||||
# WARNING: make sure you push all changes before running this.
|
|
||||||
# or you may experience inconsistences.
|
|
||||||
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
# TODO: On github/gitlab, create automation to create git version per tag
|
|
||||||
# This is just in case an user tries to download an specific version.
|
|
||||||
#-----------------------------------------------------------------------------
|
|
||||||
|
|
||||||
|
|
||||||
# Generate the checksums automatically
|
|
||||||
sed -i "s/^sha256sums=.*/$(makepkg -g -f -p PKGBUILD)/" ./PKGBUILD
|
|
||||||
|
|
||||||
# Generate tag a new tag for the new version
|
|
||||||
git tag $(printf "v1.0.r%s" "$(git rev-list --count HEAD)")
|
|
||||||
|
|
||||||
# Generate pagkage metadata
|
|
||||||
makepkg --printsrcinfo > ./.SRCINFO
|
|
||||||
|
|
||||||
# Push it to AUR
|
|
||||||
git add ./PKGBUILD ./.SRCINFO
|
|
||||||
git commit -m "New version"
|
|
||||||
git push ssh://aur@aur.archlinux.org/wofi-calc.git master
|
|
||||||
|
|
||||||
# Bye
|
|
||||||
echo -e "\n-------------------------------------------------------------------"
|
|
||||||
echo -e "NEW VERSION GENERATED\n"
|
|
||||||
|
|
@ -1,34 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
RESULT_FILE="$HOME/.config/qalculate/qalc.result.history"
|
|
||||||
if [ ! -f "$RESULT_FILE" ]; then
|
|
||||||
touch $RESULT_FILE
|
|
||||||
fi
|
|
||||||
|
|
||||||
LAST_WOFI=""
|
|
||||||
QALC_RET=""
|
|
||||||
while :
|
|
||||||
do
|
|
||||||
qalc_hist=`tac $RESULT_FILE | head -1000`
|
|
||||||
WOFI_RET=`wofi --sort-order=default --cache-file=/dev/null -d -p calc <<< "$qalc_hist"`
|
|
||||||
|
|
||||||
rtrn=$?
|
|
||||||
|
|
||||||
if test "$rtrn" = "0"; then
|
|
||||||
if [[ "$WOFI_RET" =~ .*=.* ]]; then
|
|
||||||
RESULT=`echo "$WOFI_RET" | awk {'print $NF'}`
|
|
||||||
wl-copy "$RESULT"
|
|
||||||
exit 0
|
|
||||||
else
|
|
||||||
QALC_RET=`qalc "$WOFI_RET"`
|
|
||||||
LAST_WOFI=$WOFI_RET
|
|
||||||
echo $QALC_RET >> $RESULT_FILE
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
if [ ! -z "$LAST_WOFI" ]; then
|
|
||||||
RESULT=`qalc -t "$LAST_WOFI"`
|
|
||||||
wl-copy "$RESULT"
|
|
||||||
fi
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
6
PKGBUILD
6
PKGBUILD
|
|
@ -1,5 +1,5 @@
|
||||||
pkgname=wofi-calc-git
|
pkgname=wofi-calc-git
|
||||||
pkgver=1.0.r3.7e6ecfa
|
pkgver=1.0
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
epoch=
|
epoch=
|
||||||
pkgdesc="A simple calculator for wofi, inspired in rofi-calc."
|
pkgdesc="A simple calculator for wofi, inspired in rofi-calc."
|
||||||
|
|
@ -11,7 +11,7 @@ depends=(wofi libqalculate)
|
||||||
makedepends=(wofi libqalculate)
|
makedepends=(wofi libqalculate)
|
||||||
checkdepends=()
|
checkdepends=()
|
||||||
optdepends=()
|
optdepends=()
|
||||||
provides=(wofi-calc-git wofi-calc)
|
provides=(wofi-calc-git)
|
||||||
conflicts=(wofi-calc-git wofi-calc)
|
conflicts=(wofi-calc-git wofi-calc)
|
||||||
replaces=()
|
replaces=()
|
||||||
backup=()
|
backup=()
|
||||||
|
|
@ -31,5 +31,5 @@ pkgver() {
|
||||||
package() {
|
package() {
|
||||||
# Note: 'install' is a chmod+cp one-liner command by GNU
|
# Note: 'install' is a chmod+cp one-liner command by GNU
|
||||||
mkdir -p "$pkgdir"/usr/bin
|
mkdir -p "$pkgdir"/usr/bin
|
||||||
install -m 111 "${srcdir}"/wofi-calc.sh "$pkgdir"/usr/bin/wofi-calc
|
install -m 555 "${srcdir}"/wofi-calc.sh "$pkgdir"/usr/bin/wofi-calc
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue