diff options
| author | Damian Minkov <damencho@jitsi.org> | 2006-12-19 14:43:20 +0000 |
|---|---|---|
| committer | Damian Minkov <damencho@jitsi.org> | 2006-12-19 14:43:20 +0000 |
| commit | 3b387c9ff5624a44a68f6e7de324d8a636a3a38b (patch) | |
| tree | 7a78cbde858550826a40db82fe224b1779f4ebb5 /resources/install | |
| parent | 1dcf3e626a094d29b2035ca20059b208755a7e99 (diff) | |
| download | jitsi-3b387c9ff5624a44a68f6e7de324d8a636a3a38b.zip jitsi-3b387c9ff5624a44a68f6e7de324d8a636a3a38b.tar.gz jitsi-3b387c9ff5624a44a68f6e7de324d8a636a3a38b.tar.bz2 | |
Fixed linux-generic installation as izPack loose option is not working.
Diffstat (limited to 'resources/install')
| -rw-r--r-- | resources/install/build.xml | 1 | ||||
| -rw-r--r-- | resources/install/linux/inst_path | 1 | ||||
| -rwxr-xr-x | resources/install/linux/installer-linux.xml | 9 | ||||
| -rw-r--r-- | resources/install/linux/sfx-header | 12 |
4 files changed, 14 insertions, 9 deletions
diff --git a/resources/install/build.xml b/resources/install/build.xml index c75539f..3b7fbf1 100644 --- a/resources/install/build.xml +++ b/resources/install/build.xml @@ -97,6 +97,7 @@ <copy todir="${linux.app.dir}/tmp"> <fileset dir="${basedir}/${inst.resrc}/linux"> <include name="setup.sh"/> + <include name="inst_path"/> </fileset> </copy> <!-- copy the jre --> diff --git a/resources/install/linux/inst_path b/resources/install/linux/inst_path new file mode 100644 index 0000000..9a46a64 --- /dev/null +++ b/resources/install/linux/inst_path @@ -0,0 +1 @@ +$INSTALL_PATH diff --git a/resources/install/linux/installer-linux.xml b/resources/install/linux/installer-linux.xml index f390ba2..2c5afe0 100755 --- a/resources/install/linux/installer-linux.xml +++ b/resources/install/linux/installer-linux.xml @@ -25,8 +25,6 @@ <res src="resources/install/linux/linux_shortcut_specification.xml" id="Unix_shortcutSpec.xml"/> </resources> - <native type="izpack" name="ShellLink.dll"/> - <panels> <panel classname="HelloPanel"/> <panel classname="LicencePanel"/> @@ -163,16 +161,17 @@ <file targetdir="$INSTALL_PATH" src="resources/install/linux/uninstall.sh" override="true"/> <executable targetfile="$INSTALL_PATH/run.sh" stage="never" os="linux"/> <executable targetfile="$INSTALL_PATH/uninstall.sh" stage="never" os="linux"/> - <executable targetfile="$INSTALL_PATH/jre/bin/java" stage="never" os="linux"/> + <parsable targetfile="inst_path" /> </pack> - <pack name="jre" required="yes" loose="true"> + <!-- loose param is not working --> + <!--pack name="jre" required="yes" loose="true"> <description>SIP Communicator included jre</description> <fileset targetdir="$INSTALL_PATH/jre" dir="release/linux/tmp/jre"> <include name="**/*"/> </fileset> - </pack> + </pack--> </packs> </installation> diff --git a/resources/install/linux/sfx-header b/resources/install/linux/sfx-header index 9ae4454..f32c55a 100644 --- a/resources/install/linux/sfx-header +++ b/resources/install/linux/sfx-header @@ -15,15 +15,19 @@ tail -n +$SKIP $0 | tar xz -C $WRKDIR PREV=`pwd` cd $WRKDIR -chmod +x setup.sh +chmod +x setup.sh chmod +x jre/bin/java -# this change is due to the fact that the installer searches +# this change is due to the fact that the installer searches # the jre in this directory to copy it to the installation folder -mkdir -p release/linux/tmp -ln -s `pwd`/jre release/linux/tmp/jre +#mkdir -p release/linux/tmp +#ln -s `pwd`/jre release/linux/tmp/jre ./setup.sh +INSTALL_PATH=`cat inst_path` +cp -r jre $INSTALL_PATH +chmod a+x $INSTALL_PATH/jre/bin/java + # delete the temp files cd $PREV rm -rf $WRKDIR |