summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2016-05-29 20:26:30 +0200
committer Eric Hameleers <alien@slackware.com>2016-05-29 20:26:30 +0200
commitb4ba412607f5a9958b90acdae9cb6faf495bfe72 (patch)
tree57cfd7f2675d27e1a66ef368f7caa16ffd9141a8
parent3f7f245754f2101ef2056f68863a9591026663a9 (diff)
downloadliveslak-b4ba412607f5a9958b90acdae9cb6faf495bfe72.tar.gz
liveslak-b4ba412607f5a9958b90acdae9cb6faf495bfe72.tar.xz
Some cosmetic cleanups.
-rw-r--r--README.txt2
-rwxr-xr-xmake_slackware_live.sh17
2 files changed, 9 insertions, 10 deletions
diff --git a/README.txt b/README.txt
index 4bf7a6b..9b9cfda 100644
--- a/README.txt
+++ b/README.txt
@@ -510,7 +510,7 @@ The script's parameters are:
-m pkglst[,pkglst] Add modules defined by pkglists/<pkglst>,...
-r series[,series] Refresh only one or a few package series.
-s slackrepo_dir Directory containing Slackware repository.
- -t <doc|mandoc> Trim the ISO for size (remove man and/or doc).
+ -t <doc|mandoc> Trim the ISO (remove man and/or doc).
-v Show debug/error output.
-z version Define your Slackware version (default: current).
-H hostname Hostname of the Live OS (default: darkstar).
diff --git a/make_slackware_live.sh b/make_slackware_live.sh
index 417f799..9f8371d 100755
--- a/make_slackware_live.sh
+++ b/make_slackware_live.sh
@@ -600,11 +600,10 @@ EOL
while getopts "a:d:efhm:r:s:t:vz:HO:R:X" Option
do
case $Option in
- h ) cat <<-"EOH"
- -----------------------------------------------------------------
- $Id: make_slackware_live.sh,v 1.13 2015/12/04 13:51:41 root Exp root $
- -----------------------------------------------------------------
- EOH
+ h )
+ echo "----------------------------------------------------------------"
+ echo "make_slackware_live.sh $VERSION"
+ echo "----------------------------------------------------------------"
echo "Usage:"
echo " $0 [OPTION] ..."
echo "or:"
@@ -620,19 +619,19 @@ do
echo " Use i586 for a 32bit ISO, x86_64 for 64bit."
echo " -d desktoptype SLACKWARE (full Slack), KDE4 (basic KDE4),"
echo " XFCE (basic XFCE), PLASMA5, MATE, CINNAMON."
- echo " -e Use ISO boot-load-size of 32 for computers"
+ echo " -e Use ISO boot-load-size of 32 for computers."
echo " where the ISO won't boot otherwise."
echo " -f Forced re-generation of all squashfs modules,"
echo " custom configurations and new initrd.img."
echo " -m pkglst[,pkglst] Add modules defined by pkglists/<pkglst>,..."
echo " -r series[,series] Refresh only one or a few package series."
echo " -s slackrepo_dir Directory containing ${DISTRO^} repository."
- echo " -t <doc|mandoc> Trim the ISO for size (remove man and/or doc)"
+ echo " -t <doc|mandoc> Trim the ISO (remove man and/or doc)."
echo " -v Show debug/error output."
echo " -z version Define your ${DISTRO^} version (default: $SL_VERSION)."
- echo " -H hostname Hostname of the Live OS (default: $LIVE_HOSTNAME)"
+ echo " -H hostname Hostname of the Live OS (default: $LIVE_HOSTNAME)."
echo " -O outfile Custom filename for the ISO."
- echo " -R runlevel Runlevel to boot into (default: $RUNLEVEL)"
+ echo " -R runlevel Runlevel to boot into (default: $RUNLEVEL)."
echo " -X Use xorriso instead of mkisofs/isohybrid."
exit
;;