X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage3%2Fcis-xfree86;h=fe95b2c056273a6e210cb46aed6e78a609825b2c;hb=5b913b7b528bb69a0c90583b8776d6d26b9cb189;hp=28a98627bdb0405009bf94783ac64c1dba6a3d75;hpb=f63a78e04ec65397472cda88061558f4e3a30fb2;p=hvlinux.git

diff --git a/stage3/cis-xfree86 b/stage3/cis-xfree86
index 28a9862..fe95b2c 100755
--- a/stage3/cis-xfree86
+++ b/stage3/cis-xfree86
@@ -1,4 +1,6 @@
 #!/bin/sh
+set -o errexit
+
 # First argument of this script is the package name
 
 # Reading system configuration informations, functions and package versions.
@@ -7,9 +9,9 @@ source ../functions
 source ../packages-list
 
 # Applying patches (if any)
-apply_patches ${1} &&
+apply_patches ${1}
 
-cd ${LFS_TMP}/${1} &&
+cd ${LFS_TMP}/${1}
 
 # Xfree86 may have a problem with sys/kd.h installed with some recent versions of
 # Glibc. This has recently been fixed in LFS SVN. Execute the following commands
@@ -18,19 +20,19 @@ cd ${LFS_TMP}/${1} &&
 grep "__undef_LINUX" \
     /usr/include/sys/kd.h 2>&1 > /dev/null || \
     sed -i.bak '/X.h/i #include <linux/types.h>' \
-    programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c &&
+    programs/Xserver/hw/xfree86/os-support/linux/lnx_agp.c
 
 # When building XFree86, you should create a shadow directory of symbolic links for the compiled code:
-make -C config/util -f Makefile.ini lndir &&
+make -C config/util -f Makefile.ini lndir
 
 # Now create the shadow tree:
-cd ../${1}-build &&
-../${1}/config/util/lndir ../${1} &&
+cd ../${1}-build
+../${1}/config/util/lndir ../${1}
 
 # Creating host.def
 # Although XFree86 will compile without a host.def file, the following file is
 # recommended for customizing the installation.
-cat > config/cf/host.def << "EOF" &&
+cat > config/cf/host.def << "EOF"
 /* host.def */
 /* System Related Information. */
 #define DefaultGcc2i386Opt -O2 -fomit-frame-pointer -march=_MACHINE_ARCHITECTURE_
@@ -116,28 +118,28 @@ $(FONTDIR)/TrueType,$(FONTDIR)/CID,$(FONTDIR)/Speedo
 #define BuildSpecsDocs     NO
 EOF
 
-sed -i -e "s!_MACHINE_ARCHITECTURE_!${MACHINE_ARCHITECTURE}!g" config/cf/host.def &&
-sed -i -e "s!_XF86_CARD_DRIVER_!${XF86_CARD_DRIVER}!g" config/cf/host.def &&
+sed -i -e "s!_MACHINE_ARCHITECTURE_!${MACHINE_ARCHITECTURE}!g" config/cf/host.def
+sed -i -e "s!_XF86_CARD_DRIVER_!${XF86_CARD_DRIVER}!g" config/cf/host.def
 
 sed -i 's:^.*asm.*$:# define PAGE_MASK   (~(getpagesize() - 1)):' \
-    ../${1}/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c &&
+    ../${1}/programs/Xserver/hw/xfree86/fbdevhw/fbdevhw.c
 
 sed -i -e "s@^#include <linux/config.h>@/* & */@" \
-    `grep -lr linux/config.h ../${1}` &&
-echo "make World" &&
-make World &&
+    `grep -lr linux/config.h ../${1}`
+echo "make World"
+make World
 
-echo "make install" &&
-make install &&
-echo "make install.man" &&
-make install.man &&
-ldconfig &&
+echo "make install"
+make install
+echo "make install.man"
+make install.man
+ldconfig
 
-ln -svfT /usr/X11R6/bin /usr/bin/X11 &&
-ln -svfT /usr/X11R6/lib/X11 /usr/lib/X11 &&
-ln -svfT /usr/X11R6/include/X11 /usr/include/X11 &&
+ln -svfT /usr/X11R6/bin /usr/bin/X11
+ln -svfT /usr/X11R6/lib/X11 /usr/lib/X11
+ln -svfT /usr/X11R6/include/X11 /usr/include/X11
 
-cat > /etc/X11/XF86Config << "EOF" &&
+cat > /etc/X11/XF86Config << "EOF"
 # XF86Config
 #
 # **********************************************************************
@@ -253,19 +255,19 @@ EndSection
 EOF
 
 # The ! character is the SED delimiter
-sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/X11/XF86Config &&
-sed -i -e "s!_VIDEO_CARD_DRIVER_!${XF86_CARD_DRIVER}!g" /etc/X11/XF86Config &&
-sed -i -e "s!_XF86_KEYBOARD_LAYOUT_!${HV_XF86_KEYBOARD_LAYOUT}!g" /etc/X11/XF86Config &&
-sed -i -e "s!_XF86_KEYBOARD_VARIANT_!${HV_XF86_KEYBOARD_VARIANT}!g" /etc/X11/XF86Config &&
-sed -i -e "s!_XF86_KEYBOARD_OPTIONS_!${HV_XF86_KEYBOARD_OPTIONS}!g" /etc/X11/XF86Config &&
+sed -i -e "s!_HV_FONTS_PATH_!${HV_FONTS_PATH}!g" /etc/X11/XF86Config
+sed -i -e "s!_VIDEO_CARD_DRIVER_!${XF86_CARD_DRIVER}!g" /etc/X11/XF86Config
+sed -i -e "s!_XF86_KEYBOARD_LAYOUT_!${HV_XF86_KEYBOARD_LAYOUT}!g" /etc/X11/XF86Config
+sed -i -e "s!_XF86_KEYBOARD_VARIANT_!${HV_XF86_KEYBOARD_VARIANT}!g" /etc/X11/XF86Config
+sed -i -e "s!_XF86_KEYBOARD_OPTIONS_!${HV_XF86_KEYBOARD_OPTIONS}!g" /etc/X11/XF86Config
 
-cat > /etc/skel/.xinitrc << "EOF" &&
+cat > /etc/skel/.xinitrc << "EOF"
 # ~/.xinitrc
 
 exec wmaker
 EOF
 
-cat > /etc/skel/.Xdefaults << "EOF" &&
+cat > /etc/skel/.Xdefaults << "EOF"
 xterm*scrollBar: false
 xterm*rightScrollBar: false
 xterm*saveLines: 1000
@@ -290,7 +292,7 @@ xterm*color14: #50FCF8
 xterm*color15: #F8FCF8
 EOF
 
-cat > /etc/skel/.xsession << "EOF" &&
+cat > /etc/skel/.xsession << "EOF"
 #!/bin/sh
 # ~/.xsession
 
@@ -355,30 +357,30 @@ esac
 exit 0
 EOF
 
-chmod 755 /etc/skel/.xsession &&
+chmod 755 /etc/skel/.xsession
 
-cp /etc/skel/.{xinitrc,Xdefaults,xsession} /root &&
-cp /etc/skel/.{xinitrc,Xdefaults,xsession} /home/${REGUSER} &&
+cp /etc/skel/.{xinitrc,Xdefaults,xsession} /root
+cp /etc/skel/.{xinitrc,Xdefaults,xsession} /home/${REGUSER}
 
-var_add_path "PATH" /etc/profile "/usr/X11R6/bin" &&
+var_add_path "PATH" /etc/profile "/usr/X11R6/bin"
 
-var_add_path "PKG_CONFIG_PATH" /etc/profile "/usr/X11R6/lib/pkgconfig" &&
-var_export   "PKG_CONFIG_PATH" /etc/profile &&
+var_add_path "PKG_CONFIG_PATH" /etc/profile "/usr/X11R6/lib/pkgconfig"
+var_export   "PKG_CONFIG_PATH" /etc/profile
 
-var_add_path "MANPATH" /etc/profile "/usr/X11R6/man" &&
-var_export   "MANPATH" /etc/profile &&
+var_add_path "MANPATH" /etc/profile "/usr/X11R6/man"
+var_export   "MANPATH" /etc/profile
 
-var_add_shadow "ENV_SUPATH" /etc/login.defs "/usr/X11R6/bin" &&
+var_add_shadow "ENV_SUPATH" /etc/login.defs "/usr/X11R6/bin"
 
-string_add "/usr/X11R6/lib" /etc/ld.so.conf &&
+string_add "/usr/X11R6/lib" /etc/ld.so.conf
 
 if [ "x${INST_TYPE}" = "xltsp-server" ]; then
     # Enable remote xdm login for LTSP clients
-    sed -i -e "s@^\(DisplayManager.requestPort.*\)@!\1@g" /etc/X11/xdm/xdm-config &&
-    chmod 644 /etc/X11/xdm/Xaccess &&
-    sed -i -e "s@^#\(\*[\t ]*#any host can get a login window\)@\1@g" /etc/X11/xdm/Xaccess &&
-    chmod 444 /etc/X11/xdm/Xaccess || exit 1
-fi &&
+    sed -i -e "s@^\(DisplayManager.requestPort.*\)@!\1@g" /etc/X11/xdm/xdm-config
+    chmod 644 /etc/X11/xdm/Xaccess
+    sed -i -e "s@^#\(\*[\t ]*#any host can get a login window\)@\1@g" /etc/X11/xdm/Xaccess
+    chmod 444 /etc/X11/xdm/Xaccess
+fi
 
 # When needed, XFree86 creates the directory /tmp/.ICE-unix if it does not
 # exist. If this directory is not owned by root, XFree86 delays startup by a
@@ -391,6 +393,5 @@ fi &&
 #/tmp/.ICE-unix dir 1777 root root
 #EOF
 
-# Return last error
 exit $?