xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Omaha #2735 - force the unpack of jface during CAVE installation.

Browse source 
Verified that CAVE still starts successfully.


Former-commit-id: 51f197e6b5 [formerly 8ca958407d] [formerly a03474e85b] [formerly 51f197e6b5 [formerly 8ca958407d] [formerly a03474e85b] [formerly 39a4735758 [formerly a03474e85b [formerly 084146abc21ba1e8764a8c174209b01d86c98e13]]]]
Former-commit-id: 39a4735758
Former-commit-id: 7329283b46 [formerly 34cab19d10] [formerly b5d969165ed16f17acb60ca1e6b21137ee91547a [formerly 1bef5a39a1]]
Former-commit-id: 55cacc130a74dbf48c97457bfb9462e8153020d0 [formerly 196251399e]
Former-commit-id: f736043bf0
This commit is contained in:
Bryan Kowal 2014-07-23 19:19:14 -05:00
parent a3b6361282
commit d666e7ab10
1 changed files with 14 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
rpms/awips2.cave/Installer.cave/component.spec
View file

@ -6,6 +6,7 @@
%define _swt_version 3.8.1.v3836b %define _swt_version 3.8.1.v3836b
%define _ui_version 3.8.2.v20121018-234953 %define _ui_version 3.8.2.v20121018-234953
%define _jface_version 3.8.0.v20120912-135020
# #
# awips2-cave Spec File # awips2-cave Spec File
# #
@ -210,7 +211,7 @@ popd > /dev/null 2>&1
pushd . > /dev/null 2>&1 pushd . > /dev/null 2>&1
cd /awips2/cave/plugins cd /awips2/cave/plugins
# Forcefully unzip: org.eclipse.swt.gtk.linux.x86_3.6.1.v3655c.jar # Forcefully unzip: org.eclipse.swt.gtk.linux.x86_*.jar
# : if i386 # : if i386
if [ -f org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar ]; then if [ -f org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar ]; then
mkdir org.eclipse.swt.gtk.linux.x86_%{_swt_version} mkdir org.eclipse.swt.gtk.linux.x86_%{_swt_version}
@ -220,7 +221,7 @@ if [ -f org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar ]; then
mv org.eclipse.swt.gtk.linux.x86_%{_swt_version} \ mv org.eclipse.swt.gtk.linux.x86_%{_swt_version} \
org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar org.eclipse.swt.gtk.linux.x86_%{_swt_version}.jar
fi fi
# Forcefully unzip: org.eclipse.swt.gtk.linux.x86_64_3.6.1.v3655c.jar # Forcefully unzip: org.eclipse.swt.gtk.linux.x86_64_*.jar
# : if x86_64 # : if x86_64
if [ -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar ]; then if [ -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar ]; then
mkdir org.eclipse.swt.gtk.linux.x86_64_%{_swt_version} mkdir org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}
@ -231,7 +232,7 @@ if [ -f org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar ]; then
org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar org.eclipse.swt.gtk.linux.x86_64_%{_swt_version}.jar
fi fi
# Forcefully unzip: org.eclipse.ui_3.6.1.M20100826-1330.jar # Forcefully unzip: org.eclipse.ui_*.jar
# : for i386 & x86_64 # : for i386 & x86_64
if [ -f org.eclipse.ui_%{_ui_version}.jar ]; then if [ -f org.eclipse.ui_%{_ui_version}.jar ]; then
mkdir org.eclipse.ui_%{_ui_version} mkdir org.eclipse.ui_%{_ui_version}
@ -242,6 +243,16 @@ if [ -f org.eclipse.ui_%{_ui_version}.jar ]; then
org.eclipse.ui_%{_ui_version}.jar org.eclipse.ui_%{_ui_version}.jar
fi fi
# Forcefully unzip: org.eclipse.jface_*.jar
if [ -f org.eclipse.jface_%{_jface_version}.jar ]; then
mkdir org.eclipse.jface_%{_jface_version}
unzip -qq org.eclipse.jface_%{_jface_version}.jar \
-d org.eclipse.jface_%{_jface_version}
rm -f org.eclipse.jface_%{_jface_version}.jar
mv org.eclipse.jface_%{_jface_version} \
org.eclipse.jface_%{_jface_version}.jar
fi
popd > /dev/null 2>&1 popd > /dev/null 2>&1
if [ "${1}" = "2" ]; then if [ "${1}" = "2" ]; then