Unidiff1 files changed, 9 insertions, 9 deletions
|
diff --git a/mkipks b/mkipks index 947b19e..45f2fb2 100755 --- a/ mkipks+++ b/ mkipks |
|
@@ -7,12 +7,12 @@ DEB_VERSION=2.0 |
7 | mkdir -p etc/rc2.d |
7 | mkdir -p etc/rc2.d |
8 | rm -f etc/rc2.d/S98qpe |
8 | rm -f etc/rc2.d/S98qpe |
9 | ln -s ../init.d/qpe etc/rc2.d/S98qpe |
9 | ln -s ../init.d/qpe etc/rc2.d/S98qpe |
10 | |
10 | |
11 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) |
11 | VERSION_MAJ=$(sed -n -e 's/.*QPE_VERSION "\([0-9]*\)\..*\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
12 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$QPEDIR/include/qpe/version.h) |
12 | VERSION_MIN=$(sed -n -e 's/.*QPE_VERSION ".*\.\([0-9]*\)\..*".*/\1/p' <$OPIEDIR/include/qpe/version.h) |
13 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$QPEDIR/include/qpe/version.h) |
13 | VERSION_PAT=$(sed -n -e 's/.*QPE_VERSION ".*\..*\.\([0-9]*\).*/\1/p' <$OPIEDIR/include/qpe/version.h) |
14 | if grep -q 'QPE_VERSION .*snapshot' $QPEDIR/include/qpe/version.h |
14 | if grep -q 'QPE_VERSION .*snapshot' $OPIEDIR/include/qpe/version.h |
15 | then |
15 | then |
16 | VERSION_CVS="_$(date +%Y%m%d)" |
16 | VERSION_CVS="_$(date +%Y%m%d)" |
17 | else |
17 | else |
18 | VERSION_CVS="" |
18 | VERSION_CVS="" |
@@ -46,11 +46,11 @@ do |
46 | IMAGEDIR=$1 |
46 | IMAGEDIR=$1 |
47 | DATADIR=$IMAGEDIR |
47 | DATADIR=$IMAGEDIR |
48 | mkdir -p $IMAGEDIR |
48 | mkdir -p $IMAGEDIR |
49 | ;; -rpm) |
49 | ;; -rpm) |
50 | if [ "$QPEDIR" != "/opt/Qtopia" ] |
50 | if [ "$OPIEDIR" != "/opt/Qtopia" ] |
51 | then |
51 | then |
52 | echo >&2 '$QPEDIR is not the standard /usr/Qtopia directory.' |
52 | echo >&2 '$OPIEDIR is not the standard /usr/Qtopia directory.' |
53 | sleep 1 |
53 | sleep 1 |
54 | #exit 1 |
54 | #exit 1 |
55 | fi |
55 | fi |
56 | RPM=1 |
56 | RPM=1 |
@@ -69,13 +69,13 @@ done |
69 | |
69 | |
70 | |
70 | |
71 | if [ -z "$FILES" ] |
71 | if [ -z "$FILES" ] |
72 | then |
72 | then |
73 | FILES=`find $QPEDIR -name "*.control" -print` |
73 | FILES=`find $OPIEDIR -name "*.control" -print` |
74 | fi |
74 | fi |
75 | |
75 | |
76 | RDIR=$PWD |
76 | RDIR=$PWD |
77 | cd $QPEDIR |
77 | cd $OPIEDIR |
78 | |
78 | |
79 | for i in $FILES |
79 | for i in $FILES |
80 | do |
80 | do |
81 | rm -rf $TDIR |
81 | rm -rf $TDIR |
@@ -139,9 +139,9 @@ do |
139 | if [ -n "$RPM" ] |
139 | if [ -n "$RPM" ] |
140 | then |
140 | then |
141 | case "$ff" in |
141 | case "$ff" in |
142 | /*) RPMFILES="$RPMFILES $ff" |
142 | /*) RPMFILES="$RPMFILES $ff" |
143 | ;; *) RPMFILES="$RPMFILES $QPEDIR/$ff" |
143 | ;; *) RPMFILES="$RPMFILES $OPIEDIR/$ff" |
144 | esac |
144 | esac |
145 | else |
145 | else |
146 | mkdir -p $D |
146 | mkdir -p $D |
147 | if cp -a $ff $D |
147 | if cp -a $ff $D |
|