Merge branch 'bash' into 'master'

Marius Cramer · Marius Cramer · commit 1fa1bcead3a1 · 2015-06-05T12:24:41.000+02:00
Dash problem

Define bash as a parser, some systems can have "dash" as a "sh" that will end with errors.

/usr/local/ispconfig/server/cron_daily.sh

[: 10: root: unexpected operator

[: 10: root: unexpected operator

See merge request !201
diff --git a/server/cron.sh b/server/cron.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 
diff --git a/server/scripts/run-getmail.sh b/server/scripts/run-getmail.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin
 set -e
 cd /etc/getmail
diff --git a/server/server.sh b/server/server.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 
 PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+#!/bin/bash`
`2`	`2`
`3`	`3`	`PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/local/sbin:/usr/local/bin:/usr/X11R6/bin`
`4`	`4`