diff --git a/pkgbuild b/pkgbuild index 25fe385..0b1f390 100755 --- a/pkgbuild +++ b/pkgbuild @@ -178,7 +178,7 @@ prepare_src() { fi if [ "$FILENAME" != "$FILE" ] && [ "$nxt" != 1 ]; then case $FILENAME in - *.tar|*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tbz2|*.tar.xz|*.txz|*.tar.lzma|*.zip|*.rpm) + *.tar|*.tar.gz|*.tar.Z|*.tgz|*.tar.bz2|*.tar.lz|*.tbz2|*.tar.xz|*.txz|*.tar.lzma|*.zip|*.rpm) if [ $(command -v bsdtar) ]; then COMMAND="bsdtar -p -o -C $SRC -xf $FILENAME" else diff --git a/pkgdel b/pkgdel index a2424e0..29a62b5 100755 --- a/pkgdel +++ b/pkgdel @@ -171,7 +171,7 @@ dirs="$ROOT_DIR/$SCRATCHPKG_DIR/.pkgdel_dirs" files="$ROOT_DIR/$SCRATCHPKG_DIR/.pkgdel_files" grep '/$' $ROOT_DIR/$PKGDB_DIR/*/.files \ - | grep -v "$ROOT_DIR/$PKGDB_DIR/$name" \ + | grep -v $ROOT_DIR/$PKGDB_DIR/$name/.files \ | awk -F : '{print $2}' \ | sort \ | uniq > "$reserve" diff --git a/pkgquery b/pkgquery deleted file mode 100755 index a6266ba..0000000 --- a/pkgquery +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh -# -# scratchpkg -# -# Copyright (c) 2018 by Emmett1 (emmett1.2miligrams@gmail.com) -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -echo "*** ${0##*/} is deprecated, please use 'scratch' instead ***" - -exit 0