Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (908767a1e6289aad3cdd9379d0974ac89f56acad)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Eric Sandall <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (908767a1e6289aad3cdd9379d0974ac89f56acad)
  • Date: Tue, 17 Feb 2009 19:19:53 -0600

GIT changes to master z-rejected grimoire by Eric Sandall
<sandalle AT sourcemage.org>:

z-java/jdk6-bin/INSTALL | 85 ++++++++++++++++++++---------------------
z-java/jre6-bin/INSTALL | 99
++++++++++++++++++++++++------------------------
2 files changed, 93 insertions(+), 91 deletions(-)

New commits:
commit 908767a1e6289aad3cdd9379d0974ac89f56acad
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jre6-bin: Remove TABs and cleanup formatting

commit 082626a8e89870f471f5edd17fad8d862dc24a42
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>

jdk6-bin: Remove TABs and cleanup formatting

diff --git a/z-java/jdk6-bin/INSTALL b/z-java/jdk6-bin/INSTALL
index 3f0f7cb..4ef8d47 100755
--- a/z-java/jdk6-bin/INSTALL
+++ b/z-java/jdk6-bin/INSTALL
@@ -2,54 +2,55 @@ cp -pPR jdk$VER "$INSTALL_ROOT/usr/lib" &&

if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
then
- message "${PROBLEM_COLOR}The package says i586 so if you really are
running an i386 or i486 you may experience problems with this
package${DEFAULT_COLOR}"
+ message "${PROBLEM_COLOR}The package says i586 so if you really are
running an i386 " \
+ "or i486 you may experience problems with this
package${DEFAULT_COLOR}"
fi

if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
then
- if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
- then
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
-
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
- fi &&
-
- if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
- then
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
-
${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
- fi
-
- if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
- then
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
- ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
- fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+ fi &&
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
+ then
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/i386/libnpjp2.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+ fi

elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
- then
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
-
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
- fi &&
-
- if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
- then
- ln -sf
${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
-
${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
- fi
-
- if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
- ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
- ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
- fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+ fi &&
+
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
+ then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jdk$VER/jre/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+ fi
+
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+ fi
fi &&

mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&
diff --git a/z-java/jre6-bin/INSTALL b/z-java/jre6-bin/INSTALL
index 829de69..1443dd9 100755
--- a/z-java/jre6-bin/INSTALL
+++ b/z-java/jre6-bin/INSTALL
@@ -4,66 +4,67 @@ yes | sh $SOURCE_CACHE/$SOURCE &&

if [[ "${ARCHITECTURE[0]}" == "i386" || "${ARCHITECTURE[0]}" == "i486" ]]
then
- message "${PROBLEM_COLOR}The package says i586 so if you really are
running an i386 or i486 you may experience problems with this
package${DEFAULT_COLOR}"
+ message "${PROBLEM_COLOR}The package says i586 so if you really are
running an i386 " \
+ "or i486 you may experience problems with this
package${DEFAULT_COLOR}"
fi &&

if [[ "${SMGL_COMPAT_ARCHS[1]}" == "ia32" ]]
then
-message "${MESSAGE_COLOR}Determine which browser plugins to
install${DEFAULT_COLOR}" &&
- if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
mozilla${DEFAULT_COLOR}" &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
- fi
+ message "${MESSAGE_COLOR}Determine which browser plugins to
install${DEFAULT_COLOR}" &&
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for mozilla${DEFAULT_COLOR}"
&&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libjavaplugin_oji.so
+ fi

- if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}" &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so
- fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libjavaplugin_oji.so
+ fi

- if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so
- fi
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libjavaplugin_oji.so
+ fi

- if [ -d ${INSTALL_ROOT}/usr/lib/seamonkey/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
seamonkey${DEFAULT_COLOR}" &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libjavaplugin_oji.so
- fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/seamonkey/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
seamonkey${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/seamonkey/plugins/libjavaplugin_oji.so
+ fi

- if [ -d ${INSTALL_ROOT}/usr/lib/opera/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
opera${DEFAULT_COLOR}" &&
- ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
-
${INSTALL_ROOT}/usr/lib/opera/plugins/libjavaplugin_oji.so
- fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/opera/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for opera${DEFAULT_COLOR}" &&
+ ln -sf
${INSTALL_ROOT}/usr/lib/jre$VER/plugin/i386/ns7/libjavaplugin_oji.so \
+ ${INSTALL_ROOT}/usr/lib/opera/plugins/libjavaplugin_oji.so
+ fi
elif [[ "${SMGL_COMPAT_ARCHS[1]}" == "x86_64" ]]; then
- if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
- then
- ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
- ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
- fi &&
+ if [ -d ${INSTALL_ROOT}/usr/lib/mozilla/plugins ]
+ then
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/mozilla/plugins/libnpjp2.so
+ fi &&

- if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
xulrunner${DEFAULT_COLOR}"
- ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
- ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
- fi
+ if [ -d ${INSTALL_ROOT}/usr/lib/xulrunner/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for xulrunner${DEFAULT_COLOR}"
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/usr/lib/xulrunner/plugins/libnpjp2.so
+ fi

- if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
- then
- message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
- ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so
\
- ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
- fi
+ if [ -d ${INSTALL_ROOT}/opt/firefox/plugins ]
+ then
+ message "${MESSAGE_COLOR}Installing plugin for
firefox-bin${DEFAULT_COLOR}" &&
+ ln -sf ${INSTALL_ROOT}/usr/lib/jre$VER/lib/amd64/libnpjp2.so \
+ ${INSTALL_ROOT}/opt/firefox/plugins/libnpjp2.so
+ fi
fi &&

mkdir -p ${INSTALL_ROOT}/etc/profile.d/ &&



  • [SM-Commit] GIT changes to master z-rejected grimoire by Eric Sandall (908767a1e6289aad3cdd9379d0974ac89f56acad), Eric Sandall, 02/17/2009

Archive powered by MHonArc 2.6.24.

Top of Page