zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge trunk r3938:

Browse source 
Existence of package management files is tested even if PKGMNGT=n. Fix that.
Thanks to Michael D.L. for reporting
This commit is contained in:
Pierre Labastie 2017-03-25 21:02:19 +00:00
parent 3d48216613
commit 90f822ab03
1 changed files with 20 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
common/libs/func_validate_configs.sh
View file

@ -202,25 +202,27 @@ inline_doc
;; ;;
# Case of PKGMNGT: two files, packageManager.xml and packInstall.sh # Case of PKGMNGT: two files, packageManager.xml and packInstall.sh
# must exist in $PKGMNGTDIR: # must exist in $PKGMNGTDIR if PKGMNGT='y':
PKGMNGT) echo -e "`eval echo $PARAM_VALS`" PKGMNGT) echo -e "`eval echo $PARAM_VALS`"
if [ ! -e "$PKGMNGTDIR/packageManager.xml" ]; then if [ "$PKGMNGT" = y ]; then
write_pkg_and_die $PKGMNGTDIR/packageManager.xml does not exist if [ ! -e "$PKGMNGTDIR/packageManager.xml" ]; then
fi write_pkg_and_die $PKGMNGTDIR/packageManager.xml does not exist
if [ ! -e "$PKGMNGTDIR/packInstall.sh" ]; then fi
write_pkg_and_die $PKGMNGTDIR/packInstall.sh does not exist if [ ! -e "$PKGMNGTDIR/packInstall.sh" ]; then
fi write_pkg_and_die $PKGMNGTDIR/packInstall.sh does not exist
if [ ! -s "$PKGMNGTDIR/packageManager.xml" ]; then fi
write_pkg_and_die $PKGMNGTDIR/packageManager.xml has zero size if [ ! -s "$PKGMNGTDIR/packageManager.xml" ]; then
fi write_pkg_and_die $PKGMNGTDIR/packageManager.xml has zero size
if [ ! -s "$PKGMNGTDIR/packInstall.sh" ]; then fi
write_pkg_and_die $PKGMNGTDIR/packInstall.sh has zero size if [ ! -s "$PKGMNGTDIR/packInstall.sh" ]; then
fi write_pkg_and_die $PKGMNGTDIR/packInstall.sh has zero size
if [ ! -r "$PKGMNGTDIR/packageManager.xml" ]; then fi
write_pkg_and_die $PKGMNGTDIR/packageManager.xml is not readable if [ ! -r "$PKGMNGTDIR/packageManager.xml" ]; then
fi write_pkg_and_die $PKGMNGTDIR/packageManager.xml is not readable
if [ ! -r "$PKGMNGTDIR/packInstall.sh" ]; then fi
write_pkg_and_die $PKGMNGTDIR/packInstall.sh is not readable if [ ! -r "$PKGMNGTDIR/packInstall.sh" ]; then
write_pkg_and_die $PKGMNGTDIR/packInstall.sh is not readable
fi
fi fi
;; ;;
# Display non-validated envars found in ${PROGNAME}_PARAM_LIST # Display non-validated envars found in ${PROGNAME}_PARAM_LIST