Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(298)

Unified Diff: installer/linux/generic/setup.sh

Issue 174369: Linux: fix a couple problems that Lintian reports for the .deb file:... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 11 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « installer/linux/debian_i386/links ('k') | plugin/build.scons » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: installer/linux/generic/setup.sh
===================================================================
--- installer/linux/generic/setup.sh (revision 24133)
+++ installer/linux/generic/setup.sh (working copy)
@@ -62,6 +62,7 @@
SetupO3d() {
# Create npapi plugin directories, copy and symlink libs.
O3D_DIR="/opt/google/o3d"
+ LIB_DIR=$O3D_DIR/lib
PLUGIN_DIRS="/usr/lib/firefox/plugins
/usr/lib/iceape/plugins
@@ -78,12 +79,12 @@
LIB3D="libnpo3dautoplugin.so"
echo -n "Creating plugin directories..."
- mkdir -p $PLUGIN_DIRS $O3D_DIR
+ mkdir -p $PLUGIN_DIRS $O3D_DIR $LIB_DIR
echo "ok"
echo -n "Installing files to $O3D_DIR..."
install --mode=644 ${LIB3D} $O3D_DIR
- install --mode=644 ${LIBS} $O3D_DIR
+ install --mode=644 ${LIBS} $LIB_DIR
echo "ok"
echo -n "Creating symlinks to plugin..."
@@ -92,30 +93,8 @@
done
echo "ok"
- # If 32bit arch, use /usr/lib. If 64bit, use /usr/lib32
- if [ "$ARCH" = "32bit" ]; then
- LIBDIR="/usr/lib"
- elif [ "$ARCH" = "64bit" ]; then
- LIBDIR="/usr/lib32"
- NP_WRAP="yes"
- else
- echo "$ARCH not recognized"
- exit 1
- fi
-
- echo -n "Creating symlinks to libs..."
- mkdir -p $LIBDIR
- for lib in $LIBS; do
- if [ -e "${LIBDIR}/${lib}" ]; then
- echo "$lib already exists, not replacing."
- else
- ln -s ${O3D_DIR}/${lib} ${LIBDIR}/
- fi
- done
- echo "ok"
-
# 64bit only: Check for nspluginwrapper, wrap libnpo3dautoplugin.so if found.
- if [ "$NP_WRAP" = "yes" ]; then
+ if [ "$ARCH" = "64bit" ]; then
echo -n "Attempting to wrap $LIB3D via nspluginwrapper..."
NSPW=$(which nspluginwrapper)
if [ -z "$NSPW" ]; then
« no previous file with comments | « installer/linux/debian_i386/links ('k') | plugin/build.scons » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698