]> git.ipfire.org Git - thirdparty/plymouth.git/commitdiff
Don't do library installation twice. Also fix some typos.
authorPeter Jones <pjones@redhat.com>
Wed, 30 Jul 2008 14:31:40 +0000 (10:31 -0400)
committerPeter Jones <pjones@pjones2.localdomain>
Wed, 30 Jul 2008 14:31:40 +0000 (10:31 -0400)
scripts/plymouth-populate-initrd.in

index e584ee6adbf77165a4667cb7415d32abb1cd2c66..d9c51560280373f32a1fca3a4d785abc31f940a7 100755 (executable)
@@ -57,21 +57,11 @@ set_verbose $verbose
 
 [ -z "$INITRDDIR" ] && usage error
 
-(cd $LIBDIR
-    BINS="${LIBEXECDIR}/plymouth/plymouthd ${BINDIR}/plymouth ${LIBDIR}/plymouth/spinfinity.so ${LIBDIR}/plymouth/text.so ${LIBDIR}/plymouth/details.so"
-    for bin in $BINS ; do
-        DEPS=$(get_dso_deps $bin)
-        for dep in $DEPS; do
-            inst $dep $INITRDDIR
-        done
-    done
-)
-
 inst ${LIBEXECDIR}/plymouth/plymouthd $INITRDDIR /bin/plymouthd
 inst ${BINDIR}/plymouth $INITRDDIR
 inst ${LIBDIR}/plymouth/text.so $INITRDDIR
 inst ${LIBDIR}/plymouth/details.so $INITRDDIR
-inst ${PLYMOUH_LOGO_FILE} $INITRDDIR
+inst ${PLYMOUTH_LOGO_FILE} $INITRDDIR
 mkdir -p ${INITRDDIR}${DATADIR}/plymouth
 
 PLUGIN_NAME=$(plymouth-set-default-plugin)
@@ -87,7 +77,7 @@ if [ ! -f ${LIBDIR}/plymouth/${PLUGIN_NAME}.so ]; then
 fi
 
 inst ${LIBDIR}/plymouth/${PLUGIN_NAME}.so $INITRDDIR
-inst ${LIBDIR}/plymouth/default.so $INITRDIR
+inst ${LIBDIR}/plymouth/default.so $INITRDDIR
 if [ -d ${DATADIR}/plymouth/${PLUGIN_NAME} ]; then
     for x in ${DATADIR}/plymouth/${PLUGIN_NAME}/* ; do
         [ ! -f "$x" ] && break