git.openpandora.org
/
pandora-libraries.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8fb6b90
)
adjust pnd_make.sh to make use of the new file (setting the
author
Nils Kneuper
<crazy-ivanovic@gmx.net>
Wed, 9 Mar 2011 23:31:00 +0000
(
00:31
+0100)
committer
Nils Kneuper
<crazy-ivanovic@gmx.net>
Wed, 9 Mar 2011 23:31:00 +0000
(
00:31
+0100)
folder/author correctly)
testdata/scripts/pnd_make.sh
patch
|
blob
|
history
diff --git
a/testdata/scripts/pnd_make.sh
b/testdata/scripts/pnd_make.sh
index
c645a29
..
0c03e81
100755
(executable)
--- a/
testdata/scripts/pnd_make.sh
+++ b/
testdata/scripts/pnd_make.sh
@@
-143,26
+143,23
@@
done
# Generate a PXML if the param is set to Guess or it is empty.
# Generate a PXML if the param is set to Guess or it is empty.
-#TODO: make sure this does still work nicely with the latest genpxml that sebt3 is working on!
if [ ! $PXML ] || [ $PXML = "guess" ] && [ $PNDNAME ] && [ $FOLDER ];
then
if [ -f $FOLDER/PXML.xml ]; # use the already existing PXML.xml file if there is one...
then
PXML=$FOLDER/PXML.xml
if [ ! $PXML ] || [ $PXML = "guess" ] && [ $PNDNAME ] && [ $FOLDER ];
then
if [ -f $FOLDER/PXML.xml ]; # use the already existing PXML.xml file if there is one...
then
PXML=$FOLDER/PXML.xml
- P
W
ML_ALREADY_EXISTING="true"
+ P
X
ML_ALREADY_EXISTING="true"
else
if [ -f $GENPXML_PATH ];
then
else
if [ -f $GENPXML_PATH ];
then
- PXMLtxt=$($GENPXML_PATH $FOLDER $ICON)
- if [ -
z $PXMLtxt
];
+ $GENPXML_PATH --src $FOLDER --dest $FOLDER --author $USER
+ if [ -
f $FOLDER/PXML.xml
];
then
then
+ PXML_GENERATED="true"
+ else
cecho "ERROR: Generating a PXML file using '$GENPXML_PATH' failed.
Please generate a PXML file manually." $red
exit 1
cecho "ERROR: Generating a PXML file using '$GENPXML_PATH' failed.
Please generate a PXML file manually." $red
exit 1
- else
- PXML=$FOLDER/PXML.xml
- echo "$PXMLtxt" > $FOLDER/PXML.xml
- PXML_GENERATED="true"
fi
else
cecho "ERROR: Could not find '$GENPXML_PATH' for generating a PXML file." $red
fi
else
cecho "ERROR: Could not find '$GENPXML_PATH' for generating a PXML file." $red
@@
-201,7
+198,7
@@
then
cecho "ERROR: '$PXML' doesn't exist or is not a file." $red
exit 1
else
cecho "ERROR: '$PXML' doesn't exist or is not a file." $red
exit 1
else
- if [ $P
W
ML_ALREADY_EXISTING ];
+ if [ $P
X
ML_ALREADY_EXISTING ];
then
echo "You have not explicitly specified a PXML to use, but an existing file was
found. Will be using this one."
then
echo "You have not explicitly specified a PXML to use, but an existing file was
found. Will be using this one."