No longer require config.sh
This commit is contained in:
parent
3f02b79ed1
commit
ea697c8717
|
@ -13,14 +13,13 @@
|
||||||
#
|
#
|
||||||
#You should have received a copy of the GNU General Public License
|
#You should have received a copy of the GNU General Public License
|
||||||
#along with this program. If not, see <http://www.gnu.org/licenses/>.
|
#along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#TODO:
|
|
||||||
#- no longer require config.sh
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#environment
|
#environment
|
||||||
DEBUG=0
|
DEBUG=0
|
||||||
DEVNULL="/dev/null"
|
DEVNULL="/dev/null"
|
||||||
|
PROJECTCONF="project.conf"
|
||||||
VERBOSE=0
|
VERBOSE=0
|
||||||
#executables
|
#executables
|
||||||
CVS="_debug cvs"
|
CVS="_debug cvs"
|
||||||
|
@ -38,7 +37,16 @@ deforaos_release()
|
||||||
PACKAGE=
|
PACKAGE=
|
||||||
VERSION=
|
VERSION=
|
||||||
|
|
||||||
[ -f "./config.sh" ] && . "./config.sh"
|
while read line; do
|
||||||
|
case "$line" in
|
||||||
|
"package="*)
|
||||||
|
PACKAGE="${line#package=}"
|
||||||
|
;;
|
||||||
|
"version="*)
|
||||||
|
VERSION="${line#version=}"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
done < "$PROJECTCONF"
|
||||||
if [ -z "$PACKAGE" -o -z "$VERSION" ]; then
|
if [ -z "$PACKAGE" -o -z "$VERSION" ]; then
|
||||||
_error "Could not determine the package name or version"
|
_error "Could not determine the package name or version"
|
||||||
return $?
|
return $?
|
||||||
|
@ -127,7 +135,7 @@ _debug()
|
||||||
#error
|
#error
|
||||||
_error()
|
_error()
|
||||||
{
|
{
|
||||||
echo "deforaos-release.sh: $@" 1>&2
|
echo "deforaos-release.sh: error: $@" 1>&2
|
||||||
return 2
|
return 2
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user