Permalink
Browse files

Simplify how we set PBI_PROGVERSION

  • Loading branch information...
1 parent c65ccb6 commit 7e02eb1a20f0d5567ace1c5b3f48dd9d266cf4ab @kmoore134 kmoore134 committed Oct 21, 2013
Showing with 5 additions and 7 deletions.
  1. +5 −7 src-sh/pbi-manager10/pbi-manager
@@ -1629,14 +1629,12 @@ load_pbi_conffile() {
# Get the PBI_PROGVERSION
get_pbi_progversion() {
- if [ -z "${PBI_PROGVERSION}" ] ; then
- load_pbi_conffile
+ if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi
- # If we have PBI_PROGVERSION now set
- if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi
- else
- return 0
- fi
+ load_pbi_conffile
+
+ # If we have PBI_PROGVERSION now set
+ if [ -n "${PBI_PROGVERSION}" ] ; then return 0 ; fi
# Check first if we have this pkg in PKGNG
if [ -e "/usr/local/sbin/pkg-static" -a -n "${PBI_MAKEPORT}" ] ; then

0 comments on commit 7e02eb1

Please sign in to comment.