Skip to content

Commit

Permalink
beesh: fix parsing of PKGFULLNAME and PKGFULLVERSION when modified in
Browse files Browse the repository at this point in the history
bee file.

This fixes the case, when the updated PKGFULLNAME or PKGFULLVERSION do
not contain an EXTRA with underscore.
  • Loading branch information
donald committed Aug 24, 2016
1 parent abd6507 commit a9d49da
Showing 1 changed file with 10 additions and 2 deletions.
12 changes: 10 additions & 2 deletions src/beesh.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,11 @@ function verify_new_package_variables() {
exit 1
fi
PKGNAME=${PKGFULLNAME//_*}
PKGEXTRANAME=${PKGFULLNAME#*_}
if [ "$PKGNAME" = "$PKGFULLNAME" ] ; then
PKGEXTRANAME=""
else
PKGEXTRANAME=${PKGFULLNAME#*_}
fi
fi
PKGFULLNAME="${PKGNAME}${PKGEXTRANAME:+_${PKGEXTRANAME}}"

Expand All @@ -740,7 +744,11 @@ function verify_new_package_variables() {
exit 1
fi
PKGVERSION=${PKGFULLVERSION//_*}
PKGEXTRAVERSION=${PKGFULLVERSION#*_}
if [ "$PKGVERSION" = "$PKGFULLVERSION" ] ; then
PKGEXTRAVERSION=""
else
PKGEXTRAVERSION=${PKGFULLVERSION#*_}
fi
fi
PKGFULLVERSION="${PKGVERSION}${PKGEXTRAVERSION:+_${PKGEXTRAVERSION}}"
}
Expand Down

0 comments on commit a9d49da

Please sign in to comment.