summaryrefslogtreecommitdiff
path: root/source/x/x11-skel
diff options
context:
space:
mode:
Diffstat (limited to 'source/x/x11-skel')
-rw-r--r--source/x/x11-skel/scripts/xwmconfig24
-rw-r--r--source/x/x11-skel/slack-desc8
-rwxr-xr-xsource/x/x11-skel/x11-skel.SlackBuild19
3 files changed, 30 insertions, 21 deletions
diff --git a/source/x/x11-skel/scripts/xwmconfig b/source/x/x11-skel/scripts/xwmconfig
index 724242ab..a81232f2 100644
--- a/source/x/x11-skel/scripts/xwmconfig
+++ b/source/x/x11-skel/scripts/xwmconfig
@@ -10,7 +10,7 @@
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
@@ -67,9 +67,9 @@ cat << EOF > $TMP/tmpscript.sh
#!/bin/sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
-the computer uses. KDE and GNOME provide the most features. People \\
-with Windows or MacOS experience will find either one easy to use. \\
+System. This will define the style of graphical user interface \\
+the computer uses. KDE and GNOME provide the most features. People \\
+with Windows or MacOS experience will find either one easy to use. \\
Other window managers are easier on system \\
resources, or provide other unique features." 12 74 0 \\
EOF
@@ -78,9 +78,9 @@ cat << EOF > $TMP/tmpscript.sh
#!/bin/sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
-the computer uses. KDE provides the most features, and people \\
-with Windows or MacOS experience will find it easy to use. \\
+System. This will define the style of graphical user interface \\
+the computer uses. KDE provides the most features, and people \\
+with Windows or MacOS experience will find it easy to use. \\
Other window managers are easier on system \\
resources, or provide other unique features." 12 74 0 \\
EOF
@@ -89,9 +89,9 @@ cat << EOF > $TMP/tmpscript.sh
#!/bin/sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
-the computer uses. XFce provides the most features, and people \\
-with Windows or MacOS experience will find it easy to use. \\
+System. This will define the style of graphical user interface \\
+the computer uses. XFce provides the most features, and people \\
+with Windows or MacOS experience will find it easy to use. \\
Other window managers are easier on system \\
resources, or provide other unique features." 12 74 0 \\
EOF
@@ -99,7 +99,7 @@ else
cat << EOF > $TMP/tmpscript.sh
dialog $BACKTITLE --title "SELECT DEFAULT WINDOW MANAGER FOR X" $PRESELECT --menu \\
"Please select the default window manager to use with the X Window \\
-System. This will define the style of graphical user interface \\
+System. This will define the style of graphical user interface \\
the computer uses." 12 74 0 \\
EOF
fi
@@ -211,7 +211,7 @@ if [ "$USER" = "root" ]; then
fi
fi
-# Also set up a new $HOME/.xinitrc and $HOME/.xinitrc:
+# Also set up a new $HOME/.xinitrc and $HOME/.xsession:
if [ -r /etc/X11/xinit/$OUTPUT -a ! "$HOME" = "/" ]; then
if [ -r $HOME/.xinitrc ]; then
rm -f $HOME/.xinitrc-backup
diff --git a/source/x/x11-skel/slack-desc b/source/x/x11-skel/slack-desc
index c4d1de4d..303dd986 100644
--- a/source/x/x11-skel/slack-desc
+++ b/source/x/x11-skel/slack-desc
@@ -1,15 +1,15 @@
# HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description. Line
+# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in. You must
-# make exactly 11 lines for the formatting to be correct. It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
x11-skel: x11-skel (Miscellaneous things required for X)
x11-skel:
x11-skel: These are some symlinks needed by X11 after moving some files and
-x11-skel: directories to conform with the Linux FHS. For example, the fonts
+x11-skel: directories to conform with the Linux FHS. For example, the fonts
x11-skel: are now in the /usr/share/fonts directory, and this package makes
x11-skel: a symlink to there from /usr/lib/X11/fonts (the default location).
x11-skel: An /etc/xdg directory (the default for XDG_CONFIG_DIRS in the
diff --git a/source/x/x11-skel/x11-skel.SlackBuild b/source/x/x11-skel/x11-skel.SlackBuild
index 98381b68..36c83773 100755
--- a/source/x/x11-skel/x11-skel.SlackBuild
+++ b/source/x/x11-skel/x11-skel.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
-# Copyright 2008, 2009, 2011, 2012 Patrick J. Volkerding, Sebeka, Minnesota, USA
+# Copyright 2008, 2009, 2011, 2012, 2018 Patrick J. Volkerding, Sebeka, Minnesota, USA
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@@ -20,27 +20,36 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+cd $(dirname $0) ; CWD=$(pwd)
+PKGNAM=x11-skel
VERSION=7.7
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) export ARCH=i486 ;;
+ i?86) export ARCH=i586 ;;
arm*) export ARCH=arm ;;
# Unless $ARCH is already set, use uname -m for all other archs:
*) export ARCH=$( uname -m ) ;;
esac
fi
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+ echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+ exit 0
+fi
+
if [ "$ARCH" = "x86_64" ]; then
LIBDIRSUFFIX="64"
else
LIBDIRSUFFIX=""
fi
-CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=$TMP/package-x11-skel