diff options
author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-08-22 15:16:16 +0200 |
---|---|---|
committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2012-08-22 15:16:16 +0200 |
commit | ec0e109537c6479ad036a8ab457fdd7824485e38 (patch) | |
tree | 38227d7fccb324c0b50f6f86dcdf40f081a6a94d | |
parent | 54c6983083bf9c67c7562cf48fa638c3a3f864de (diff) | |
download | internet-kiosk-ec0e109537c6479ad036a8ab457fdd7824485e38.tar.gz internet-kiosk-ec0e109537c6479ad036a8ab457fdd7824485e38.tar.bz2 internet-kiosk-ec0e109537c6479ad036a8ab457fdd7824485e38.zip |
Add line breaks after 80 chars in ik_* scripts.
-rw-r--r-- | debian/changelog | 1 | ||||
-rwxr-xr-x | internet-kiosk-management/sbin/ik_cleanup | 16 | ||||
-rwxr-xr-x | internet-kiosk-management/sbin/ik_create | 7 | ||||
-rwxr-xr-x | internet-kiosk-management/sbin/ik_preptftpboot | 6 | ||||
-rwxr-xr-x | internet-kiosk-management/sbin/ik_shell | 3 | ||||
-rwxr-xr-x | internet-kiosk-management/sbin/ik_update | 10 | ||||
-rwxr-xr-x | internet-kiosk-management/sbin/ik_upgrade | 7 |
7 files changed, 33 insertions, 17 deletions
diff --git a/debian/changelog b/debian/changelog index 9d23842..5df5349 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ internet-kiosk (0.0.2-0~edu1) UNRELEASED; urgency=low chroots. - Provide README.unconfigured file in /etc/internet-kiosk. - Fix ik_dte_shell.sh script, escape braces. + - Add line breaks after 80 chars in ik_* scripts. -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de> Tue, 21 Aug 2012 18:14:02 +0200 diff --git a/internet-kiosk-management/sbin/ik_cleanup b/internet-kiosk-management/sbin/ik_cleanup index 8be800b..50726b9 100755 --- a/internet-kiosk-management/sbin/ik_cleanup +++ b/internet-kiosk-management/sbin/ik_cleanup @@ -36,14 +36,17 @@ IK_CONFIG="${IK_CONFIG:-$IK_BASE/etc}" IK_TFTP_BOOT="${IK_TFTP_BOOT:-/srv/tftp}" [ "x$USER" == "xroot" ] || { - echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run as super-user root." + echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run" + echo "as super-user root." exit -2 } echo "Internet Kiosk Diskless Terminal cleanup..." echo "-------------------------------------------" -echo "Hit <RETURN> to purge all Internet Kiosk Diskless Terminal related files (chroot, config, PXE boot env)..." +echo "Hit <RETURN> to purge all Internet Kiosk Diskless Terminal related files" +echo "(chroot, config, PXE boot env)..." +echo echo "Alternatively, hit STRG-C to cancel the operation now!!!" read @@ -52,13 +55,15 @@ test -e "$IK_CHROOT" && { echo "Removing $IK_CHROOT..." rm -Rf "${IK_CHROOT}" } || { - echo "WARNING: Internet Kiosk Diskless Terminal chroot does not exist at $IK_CHROOT. No cleanup necessary..." + echo "WARNING: Internet Kiosk Diskless Terminal chroot does not exist" + echo "at $IK_CHROOT. No cleanup necessary..." } test -e "$IK_CONFIG" && { echo "Removing $IK_CONFIG..." rm -Rf "${IK_CONFIG}" } || { - echo "WARNING: Internet Kiosk Diskless Terminal config does not exist at $IK_CONFIG. No cleanup necessary..." + echo "WARNING: Internet Kiosk Diskless Terminal config does not exist" + echo "at $IK_CONFIG. No cleanup necessary..." } ### PXE/Syslinux @@ -66,7 +71,8 @@ test -e "$IK_TFTP_BOOT/pxelinux.cfg" && { echo "Emptying $IK_TFTP_BOOT..." rm -Rf "${IK_TFTP_BOOT}"/* } || { - echo "WARNING: Internet Kiosk PXE/Syslinux boot environment does not exist at $IK_TFTP_BOOT. No cleanup necessary..." + echo "WARNING: Internet Kiosk PXE/Syslinux boot environment does not exist" + echo "at $IK_TFTP_BOOT. No cleanup necessary..." } echo diff --git a/internet-kiosk-management/sbin/ik_create b/internet-kiosk-management/sbin/ik_create index dfe6955..3771184 100755 --- a/internet-kiosk-management/sbin/ik_create +++ b/internet-kiosk-management/sbin/ik_create @@ -49,11 +49,14 @@ test -e "$IK_CHROOT" && { } [ "x$USER" == "xroot" ] || { - echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run as super-user root." + echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run" + echo "as super-user root." exit -2 } -echo "Hit <RETURN> to continue with the Internet Kiosk Terminal's chroot creation using the above parameters..." +echo "Hit <RETURN> to continue with the Internet Kiosk Terminal's chroot creation" +echo "using the above parameters..." +echo echo "Alternatively, hit STRG-C to cancel the operation now!!!" read diff --git a/internet-kiosk-management/sbin/ik_preptftpboot b/internet-kiosk-management/sbin/ik_preptftpboot index db0c28a..1b78479 100755 --- a/internet-kiosk-management/sbin/ik_preptftpboot +++ b/internet-kiosk-management/sbin/ik_preptftpboot @@ -47,7 +47,8 @@ test -e "$IK_TFTP_BOOT/pxelinux.cfg" && { } [ "x$USER" == "xroot" ] || { - echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run as super-user root." + echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run" + echo "as super-user root." exit -2 } @@ -59,7 +60,8 @@ echo "Copying the Internet Kiosk Terminal's TFTP (syslinux) template files..." cp -av "$IK_TFTP_FILES"/* "$IK_TFTP_BOOT" echo -echo "Linking files for the Internet Kiosk Terminal's TFTP (syslinux) boot environment..." +echo "Linking files for the Internet Kiosk Terminal's TFTP (syslinux) boot" +echo "environment..." cd "$IK_TFTP_BOOT" # 486 kernel image diff --git a/internet-kiosk-management/sbin/ik_shell b/internet-kiosk-management/sbin/ik_shell index 65d6c10..c75dcd0 100755 --- a/internet-kiosk-management/sbin/ik_shell +++ b/internet-kiosk-management/sbin/ik_shell @@ -40,7 +40,8 @@ test -e "$IK_CHROOT" || { } [ "x$USER" == "xroot" ] || { - echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run as super-user root." + echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/internet-kiosk-management/sbin/ik_update b/internet-kiosk-management/sbin/ik_update index 0a3eac6..f6aa9a5 100755 --- a/internet-kiosk-management/sbin/ik_update +++ b/internet-kiosk-management/sbin/ik_update @@ -35,18 +35,20 @@ IK_CHROOT="${IK_CHROOT:-$IK_BASE/chroot}" IK_CONFIG="${IK_CONFIG:-$IK_BASE/etc}" test -e "$IK_CHROOT" || { - echo "ERROR: Internet Kiosk Diskless Terminal chroot does not exist at $IK_CHROOT." - echo "Run ik_create to create it..." + echo "ERROR: Internet Kiosk Diskless Terminal chroot does not exist" + echo "at $IK_CHROOT. Run ik_create to create it..." exit -1 } test -e "$IK_CONFIG" || { - echo "ERROR: No Internet Kiosk Diskless Terminal configuration found at $IK_CONFIG. Please check..." + echo "ERROR: No Internet Kiosk Diskless Terminal configuration found" + echo "at $IK_CONFIG. Please check..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run as super-user root." + echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run" + echo "as super-user root." exit -2 } diff --git a/internet-kiosk-management/sbin/ik_upgrade b/internet-kiosk-management/sbin/ik_upgrade index 4a6cb29..3f92fd9 100755 --- a/internet-kiosk-management/sbin/ik_upgrade +++ b/internet-kiosk-management/sbin/ik_upgrade @@ -33,13 +33,14 @@ source $ETCDIR/ik_settings IK_CHROOT="${IK_CHROOT:-/opt/internet-kiosk}" test -e "$IK_CHROOT" || { - echo "ERROR: Internet Kiosk Diskless Terminal chroot does not exist at $IK_CHROOT." - echo "Run ik_create to create it..." + echo "ERROR: Internet Kiosk Diskless Terminal chroot does not exist" + echo "at $IK_CHROOT. Run ik_create to create it..." exit -1 } [ "x$USER" == "xroot" ] || { - echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run as super-user root." + echo "ERROR: Internet Kiosk Diskless Terminal management scripts have to run" + echo "as super-user root." exit -2 } |