summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/Makefile.am2
-rw-r--r--scripts/Makefile.am2
-rw-r--r--scripts/repo-add.sh.in20
-rw-r--r--src/pacman/Makefile.am2
4 files changed, 14 insertions, 12 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am
index b708d3f2..00a0e88d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -63,7 +63,7 @@ dist-hook:
$(MAKE) $(AM_MAKEFLAGS) all
if USE_GIT_VERSION
-GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty
+GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//')
REAL_PACKAGE_VERSION = $(GIT_VERSION)
else
REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 2962b915..ae6ce366 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -25,7 +25,7 @@ EXTRA_DIST = \
MOSTLYCLEANFILES = $(bin_SCRIPTS) *.tmp
if USE_GIT_VERSION
-GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty
+GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//')
REAL_PACKAGE_VERSION = $(GIT_VERSION)
else
REAL_PACKAGE_VERSION = $(PACKAGE_VERSION)
diff --git a/scripts/repo-add.sh.in b/scripts/repo-add.sh.in
index 2929c967..9b79022a 100644
--- a/scripts/repo-add.sh.in
+++ b/scripts/repo-add.sh.in
@@ -234,9 +234,9 @@ db_write_entry()
if [[ -d $pkgname-$pkgver ]]; then
warning "$(gettext "An entry for '%s' already existed")" "$pkgname-$pkgver"
else
- if [ $DELTA -eq 1 ]; then
+ if (( DELTA )); then
pkgentry=$(find_pkgentry $pkgname)
- if [ -n "$pkgentry" ]; then
+ if [[ -n $pkgentry ]]; then
local oldfilename=$(grep -A1 FILENAME $pkgentry/desc | tail -n1)
local oldfile="$(dirname $1)/$oldfilename"
fi
@@ -296,14 +296,16 @@ db_write_entry()
fi
# create a delta file
- if [ -n "$oldfilename" ]; then
- if [ -f "$oldfile" ]; then
- delta=$(pkgdelta -q $oldfile $1)
- if [ -f "$delta" ]; then
- db_write_delta $delta
+ if (( DELTA )); then
+ if [[ -n $oldfilename ]]; then
+ if [[ -f $oldfile ]]; then
+ delta=$(pkgdelta -q $oldfile $1)
+ if [[ -f $delta ]]; then
+ db_write_delta $delta
+ fi
+ else
+ warning "$(gettext "Old package file not found: %s")" "$oldfilename"
fi
- else
- warning "$(gettext "Old package file not found: %s")" "$oldfilename"
fi
fi
diff --git a/src/pacman/Makefile.am b/src/pacman/Makefile.am
index 8c14562c..31e8b134 100644
--- a/src/pacman/Makefile.am
+++ b/src/pacman/Makefile.am
@@ -18,7 +18,7 @@ INCLUDES = -I$(top_srcdir)/lib/libalpm
AM_CFLAGS = -pedantic -D_GNU_SOURCE
if USE_GIT_VERSION
-GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 | sed s/^v//')-dirty
+GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty | sed s/^v//')
DEFS += -DGIT_VERSION=\"$(GIT_VERSION)\"
endif