zawz/zpkg
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix package maching for composed words

Browse source
This commit is contained in:
zawz 2020-06-06 18:22:38 +02:00
parent 3bd2e6e638
commit 46a52e4807
5 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/deploy.sh
View file

@ -36,7 +36,7 @@ package()
deploy_package() deploy_package()
{ {
echo "Deploying $(basename "$1"): $(du -sh "$1" | awk '{print $1}')iB" echo "Deploying $(basename "$1"): $(du -sh "$1" | awk '{print $1}')iB"
scp "$1" $SSH_ADDRESS:~/'$(grep "PKG_PATH=" .config | cut -d"=" -f2-)' scp "$1" $SSH_ADDRESS:'$(grep "PKG_PATH=" .config | cut -d"=" -f2-)'
} }
deploy_folder() deploy_folder()

2
src/install.sh
View file

@ -11,7 +11,7 @@ add_package_entry()
{ {
( (
cd "$PKG_PATH" cd "$PKG_PATH"
if grep -q -w "^$1" installed 2>/dev/null if grep -q "^$1 " installed 2>/dev/null
then then
$2 sed "s|$1 .*\$|$1 $(date +%s)|g" -i installed $2 sed "s|$1 .*\$|$1 $(date +%s)|g" -i installed
else else

4
src/print.sh
View file

@ -41,8 +41,8 @@ error() {
package_info() { package_info() {
unset cleanup unset cleanup
status="not installed" status="not installed"
grep -wq "^$1" "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$1' not found" && return 1; } grep -q "^$1 " "$PKG_PATH/pkglist" 2>/dev/null || { echo "Package '$1' not found" && return 1; }
grep -wq "^$1" "$PKG_PATH/installed" 2>/dev/null && status=installed grep -q "^$1 " "$PKG_PATH/installed" 2>/dev/null && status=installed
tmpdir="/tmp/zpkg_$(random_string 5)" tmpdir="/tmp/zpkg_$(random_string 5)"
mkdir -p "$tmpdir" || return $? mkdir -p "$tmpdir" || return $?
pwd="$(pwd)" pwd="$(pwd)"

2
src/remove.sh
View file

@ -13,7 +13,7 @@ remove_package()
{ {
cd "$PKG_PATH" cd "$PKG_PATH"
archive="$(pwd)/$1.tar.$extension" archive="$(pwd)/$1.tar.$extension"
if [ ! -f "$archive" ] || ! grep -q -w "^$1" installed if [ ! -f "$archive" ] || ! grep -q "^$1 " installed
then then
echo "Package '$1' not installed" >&2 echo "Package '$1' not installed" >&2
return 1 return 1

10
src/view.sh
View file

@ -3,7 +3,7 @@
deps() deps()
{ {
cd "$PKG_PATH" cd "$PKG_PATH"
l=$(grep -w "^$1" pkglist) || return $? l=$(grep "^$1 " pkglist) || return $?
echo "$l" | cut -d' ' -f3- echo "$l" | cut -d' ' -f3-
} }
@ -18,7 +18,7 @@ resolve_packages()
cd "$PKG_PATH" cd "$PKG_PATH"
for I in $* for I in $*
do do
if ! grep -wq "^$I" pkglist 2>/dev/null if ! grep -q "^$I " pkglist 2>/dev/null
then then
[ "$LOG" = "true" ] && echo "Package '$I' not found" >&2 [ "$LOG" = "true" ] && echo "Package '$I' not found" >&2
RET=1 RET=1
@ -46,7 +46,7 @@ resolve_deps()
is_installed() is_installed()
{ {
cd "$PKG_PATH" cd "$PKG_PATH"
grep -qw "^$1" installed 2>/dev/null grep -q "^$1 " installed 2>/dev/null
return $? return $?
} }
@ -67,7 +67,7 @@ removed_packages()
cat installed 2>/dev/null | while read -r in cat installed 2>/dev/null | while read -r in
do do
name=$(echo "$in" | awk '{print $1}') name=$(echo "$in" | awk '{print $1}')
rem=$(grep -w "^$name" pkglist | awk '{print $2}') rem=$(grep "^$name " pkglist | awk '{print $2}')
[ -z "$rem" ] && echo $name [ -z "$rem" ] && echo $name
done done
} }
@ -79,7 +79,7 @@ outdated_packages()
do do
name=$(echo "$in" | awk '{print $1}') name=$(echo "$in" | awk '{print $1}')
loc=$(echo "$in" | awk '{print $2}') loc=$(echo "$in" | awk '{print $2}')
rem=$(grep -w "^$name" pkglist | awk '{print $2}') rem=$(grep "^$name " pkglist | awk '{print $2}')
[ -n "$rem" ] && [ "$loc" -lt "$rem" ] && echo $name [ -n "$rem" ] && [ "$loc" -lt "$rem" ] && echo $name
done done
} }