diff --git a/server/build-pgadmin.sh.in b/server/build-pgadmin.sh.in index 98e6b003..5eba5c9a 100755 --- a/server/build-pgadmin.sh.in +++ b/server/build-pgadmin.sh.in @@ -11,12 +11,12 @@ TEMP_DIR=${SOURCE_DIR}/mac-temp _setup_env() { export PATH=${YARN_HOME}/bin:${NODEJS_HOME}:${PGBUILD}/bin:${PATH}:/opt/local/bin: - APP_RELEASE=`grep "^APP_RELEASE" ${SOURCE_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g'` - APP_REVISION=`grep "^APP_REVISION" ${SOURCE_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g'` - APP_NAME=`grep "^APP_NAME" ${SOURCE_DIR}/web/config.py | cut -d"=" -f2 | sed "s/'//g" | sed 's/^ //'` + APP_RELEASE=`grep "^APP_RELEASE" ${SOURCE_DIR}/web/version.py | cut -d"=" -f2 | sed 's/ //g'` + APP_REVISION=`grep "^APP_REVISION" ${SOURCE_DIR}/web/version.py | cut -d"=" -f2 | sed 's/ //g'` + APP_NAME=`grep "^APP_NAME" ${SOURCE_DIR}/web/branding.py | cut -d"=" -f2 | sed "s/'//g" | sed 's/^ //'` APP_LONG_VERSION=${APP_RELEASE}.${APP_REVISION} APP_SHORT_VERSION=`echo ${APP_LONG_VERSION} | cut -d . -f1,2` - APP_SUFFIX=`grep "^APP_SUFFIX" ${SOURCE_DIR}/web/config.py | cut -d"=" -f2 | sed 's/ //g' | sed "s/'//g"` + APP_SUFFIX=`grep "^APP_SUFFIX" ${SOURCE_DIR}/web/version.py | cut -d"=" -f2 | sed 's/ //g' | sed "s/'//g"` if [ ! -z ${APP_SUFFIX} ]; then APP_LONG_VERSION=${APP_LONG_VERSION}-${APP_SUFFIX} fi