[arch-releng] [RFC2] [PATCH] [syslinux-iso] Some fixes for automated_script
Fixes FS#23610 Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar> --- .../overlay/etc/rc.d/functions.d/automated_script | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script index 09f04b8..076a49c 100644 --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script +++ b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script @@ -1,18 +1,18 @@ automated_script () { script="$(kernel_cmdline script)" - if [ -n $script ] ; then + if [[ -n "$script" ]]; then stat_busy "Configuring $script" - if [[ $script =~ ^http:// || $script =~ ^ftp:// ]] ; then + if [[ "$script" =~ "^http://" || "$script" =~ "^ftp://" ]]; then wget "$script" -q -O /tmp/startup_script >/dev/null rt=$? else - cp $script /tmp/startup_script + cp "$script" /tmp/startup_script rt=$? fi - if [ $rt -eq 0 ] ; then + if [ $rt -eq 0 ]; then chmod +x /tmp/startup_script - echo -e "\nif [ \`tty\` = \"/dev/tty1\" ] ; then\n /tmp/startup_script\nfi\n" >> /root/.bash_profile + echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n' >> /root/.bash_profile stat_done else stat_fail -- 1.7.4.4
Fixes FS#23610
Signed-off-by: Gerardo Exequiel Pozzi<vmlinuz386@yahoo.com.ar> --- .../overlay/etc/rc.d/functions.d/automated_script | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script index 09f04b8..076a49c 100644 --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script +++ b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script @@ -1,18 +1,18 @@ automated_script () { script="$(kernel_cmdline script)" - if [ -n $script ] ; then + if [[ -n "$script" ]]; then stat_busy "Configuring $script" - if [[ $script =~ ^http:// || $script =~ ^ftp:// ]] ; then + if [[ "$script" =~ "^http://" || "$script" =~ "^ftp://" ]]; then wget "$script" -q -O /tmp/startup_script>/dev/null rt=$? else - cp $script /tmp/startup_script + cp "$script" /tmp/startup_script rt=$? fi - if [ $rt -eq 0 ] ; then + if [ $rt -eq 0 ]; then chmod +x /tmp/startup_script - echo -e "\nif [ \`tty\` = \"/dev/tty1\" ] ; then\n /tmp/startup_script\nfi\n">> /root/.bash_profile + echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n /tmp/startup_script\nfi\n'>> /root/.bash_profile stat_done else stat_fail
On 04/14/2011 09:49 PM, Gerardo Exequiel Pozzi wrote: pushed to master -- Gerardo Exequiel Pozzi \cos^2\alpha + \sin^2\alpha = 1
participants (1)
-
Gerardo Exequiel Pozzi