Skip to content

Commit 02519e1

Browse files
muuki88muuki88
committed
Remove all tabs from bash scripts
1 parent cda1f21 commit 02519e1

File tree

9 files changed

+80
-80
lines changed

9 files changed

+80
-80
lines changed

‎src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-systemd-template

+8-8
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010

1111
# Available replacements
1212
# ------------------------------------------------
13-
# ${{author}} debian author
14-
# ${{descr}} debian package description
15-
# ${{exec}} startup script name
16-
# ${{chdir}} app directory
17-
# ${{retries}} retries for startup
18-
# ${{retryTimeout}} retry timeout
19-
# ${{app_name}} normalized app name
20-
# ${{daemon_user}} daemon user
13+
# ${{author}} debian author
14+
# ${{descr}} debian package description
15+
# ${{exec}} startup script name
16+
# ${{chdir}} app directory
17+
# ${{retries}} retries for startup
18+
# ${{retryTimeout}} retry timeout
19+
# ${{app_name}} normalized app name
20+
# ${{daemon_user}} daemon user
2121
# -------------------------------------------------
2222

2323
# Setting JAVA_OPTS

‎src/main/resources/com/typesafe/sbt/packager/archetypes/etc-default-template

+8-8
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@
88

99
# Available replacements
1010
# ------------------------------------------------
11-
# ${{author}} debian author
12-
# ${{descr}} debian package description
13-
# ${{exec}} startup script name
14-
# ${{chdir}} app directory
15-
# ${{retries}} retries for startup
16-
# ${{retryTimeout}} retry timeout
17-
# ${{app_name}} normalized app name
18-
# ${{daemon_user}} daemon user
11+
# ${{author}} debian author
12+
# ${{descr}} debian package description
13+
# ${{exec}} startup script name
14+
# ${{chdir}} app directory
15+
# ${{retries}} retries for startup
16+
# ${{retryTimeout}} retry timeout
17+
# ${{app_name}} normalized app name
18+
# ${{daemon_user}} daemon user
1919
# -------------------------------------------------
2020

2121
# Setting JAVA_OPTS

‎src/main/resources/com/typesafe/sbt/packager/archetypes/java_server/rpm/postun-template

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ then
1010
echo "Try deleting system user and group [${{daemon_user}}:${{daemon_group}}]"
1111
if getent passwd | grep -q "^${{daemon_user}}:";
1212
then
13-
echo "Deleting system user: ${{daemon_user}}"
14-
deleteUser ${{daemon_user}}
13+
echo "Deleting system user: ${{daemon_user}}"
14+
deleteUser ${{daemon_user}}
1515
fi
1616
if getent group | grep -q "^${{daemon_group}}:" ;
1717
then
18-
echo "Deleting system group: ${{daemon_group}}"
19-
deleteGroup ${{daemon_group}}
18+
echo "Deleting system group: ${{daemon_group}}"
19+
deleteGroup ${{daemon_group}}
2020
fi
2121
fi

‎src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemv/loader-functions

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@
55
addService() {
66
app_name=$1
77
if hash update-rc.d >/dev/null 2>&1; then
8-
echo "Adding $app_name to service management using update-rc.d"
9-
update-rc.d $app_name defaults
8+
echo "Adding $app_name to service management using update-rc.d"
9+
update-rc.d $app_name defaults
1010
elif hash chkconfig >/dev/null 2>&1; then
11-
echo "Adding $app_name to service management using chkconfig"
12-
chkconfig --add ${{app_name}}
13-
chkconfig $app_name on
11+
echo "Adding $app_name to service management using chkconfig"
12+
chkconfig --add ${{app_name}}
13+
chkconfig $app_name on
1414
else
15-
echo "WARNING: Could not add $app_name to autostart: neither update-rc nor chkconfig found!"
15+
echo "WARNING: Could not add $app_name to autostart: neither update-rc nor chkconfig found!"
1616
fi
1717
}
1818

@@ -32,16 +32,16 @@ startService() {
3232
stopService() {
3333
app_name=$1
3434
if hash update-rc.d >/dev/null 2>&1; then
35-
echo "Removing $app_name from autostart using update-rc.d"
36-
update-rc.d -f $app_name remove
37-
service $app_name stop
35+
echo "Removing $app_name from autostart using update-rc.d"
36+
update-rc.d -f $app_name remove
37+
service $app_name stop
3838
elif hash chkconfig >/dev/null 2>&1; then
39-
echo "Removing $app_name from autostart using chkconfig"
40-
chkconfig $app_name off
41-
chkconfig --del $app_name
42-
service $app_name stop
39+
echo "Removing $app_name from autostart using chkconfig"
40+
chkconfig $app_name off
41+
chkconfig --del $app_name
42+
service $app_name stop
4343
else
44-
echo "WARNING: Could not remove $app_name from autostart: neither update-rc nor chkconfig found!"
44+
echo "WARNING: Could not remove $app_name from autostart: neither update-rc nor chkconfig found!"
4545
fi
4646
}
4747

@@ -50,6 +50,6 @@ stopService() {
5050
# $1 = service name
5151
#
5252
restartService() {
53-
app_name=$1
54-
service $app_name restart
53+
app_name=$1
54+
service $app_name restart
5555
}

‎src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemv/start-debian-template

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,11 +70,11 @@ case "$1" in
7070
start)
7171
start_daemon
7272
exit $?
73-
;;
73+
;;
7474
stop)
7575
stop_daemon
7676
exit $?
77-
;;
77+
;;
7878
restart|force-reload)
7979
stop_daemon
8080
start_daemon

‎src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/systemv/start-rpm-template

+20-20
Original file line numberDiff line numberDiff line change
@@ -117,32 +117,32 @@ rh_status_q() {
117117

118118
case "$1" in
119119
start)
120-
rh_status_q && exit 0
121-
$1
122-
;;
120+
rh_status_q && exit 0
121+
$1
122+
;;
123123
stop)
124-
rh_status_q || exit 0
125-
$1
126-
;;
124+
rh_status_q || exit 0
125+
$1
126+
;;
127127
restart)
128-
$1
129-
;;
128+
$1
129+
;;
130130
reload)
131-
rh_status || exit 7
132-
$1
133-
;;
131+
rh_status || exit 7
132+
$1
133+
;;
134134
force-reload)
135-
force_reload
136-
;;
135+
force_reload
136+
;;
137137
status)
138-
rh_status
139-
;;
138+
rh_status
139+
;;
140140
condrestart|try-restart)
141-
rh_status || exit 0
142-
restart
143-
;;
141+
rh_status || exit 0
142+
restart
143+
;;
144144
*)
145-
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
146-
exit 2
145+
echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
146+
exit 2
147147
esac
148148
exit $?

‎src/main/resources/com/typesafe/sbt/packager/archetypes/systemloader/upstart/start-template

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ respawn limit ${{retries}} ${{retryTimeout}}
2727
limit nofile ${{file_descriptor_limit}} ${{file_descriptor_limit}}
2828

2929
pre-start script
30-
[ -d /var/run/${{app_name}} ] || install -m 755 -o ${{daemon_user}} -g ${{daemon_group}} -d /var/run/${{app_name}}
30+
[ -d /var/run/${{app_name}} ] || install -m 755 -o ${{daemon_user}} -g ${{daemon_group}} -d /var/run/${{app_name}}
3131
end script
3232

3333
# set the working directory of the job processes

‎src/main/resources/com/typesafe/sbt/packager/debian/postrm-template

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ case "$1" in
66
remove|failed-upgrade|abort-upgrade|abort-install|disappear)
77
;;
88
purge)
9-
deleteUser ${{daemon_user}}
10-
deleteGroup ${{daemon_group}}
9+
deleteUser ${{daemon_user}}
10+
deleteGroup ${{daemon_group}}
1111
;;
1212
upgrade)
1313
;;

‎src/main/resources/com/typesafe/sbt/packager/linux/control-functions

+19-19
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,22 @@
1111
addUser() {
1212
user="$1"
1313
if [ -z "$user" ]; then
14-
echo "usage: addUser user [group] [description] [shell]"
15-
exit 1
14+
echo "usage: addUser user [group] [description] [shell]"
15+
exit 1
1616
fi
1717
uid="$2"
1818
if [ -z "$uid" ]; then
19-
uid_flags=""
20-
else
21-
uid_flags="--uid $uid"
19+
uid_flags=""
20+
else
21+
uid_flags="--uid $uid"
2222
fi
2323
group=${3:-$user}
2424
descr=${4:-No description}
2525
shell=${5:-/bin/false}
2626
if ! getent passwd | grep -q "^$user:";
2727
then
28-
echo "Creating system user: $user in $group with $descr and shell $shell"
29-
useradd $uid_flags --gid $group -r --shell $shell -c "$descr" $user
28+
echo "Creating system user: $user in $group with $descr and shell $shell"
29+
useradd $uid_flags --gid $group -r --shell $shell -c "$descr" $user
3030
fi
3131
}
3232

@@ -37,38 +37,38 @@ addGroup() {
3737
group="$1"
3838
gid="$2"
3939
if [ -z "$gid" ]; then
40-
gid_flags=""
41-
else
42-
gid_flags="--gid $gid"
43-
fi
40+
gid_flags=""
41+
else
42+
gid_flags="--gid $gid"
43+
fi
4444
if ! getent group | grep -q "^$group:" ;
4545
then
46-
echo "Creating system group: $group"
47-
groupadd $gid_flags -r $group
46+
echo "Creating system group: $group"
47+
groupadd $gid_flags -r $group
4848
fi
4949
}
5050

5151
# Will return true even if deletion fails
5252
# $1 = user
5353
deleteUser() {
5454
if hash deluser 2>/dev/null; then
55-
deluser --quiet --system $1 > /dev/null || true
55+
deluser --quiet --system $1 > /dev/null || true
5656
elif hash userdel 2>/dev/null; then
57-
userdel $1
57+
userdel $1
5858
else
59-
echo "WARNING: Could not delete user $1 . No suitable program (deluser, userdel) found"
59+
echo "WARNING: Could not delete user $1 . No suitable program (deluser, userdel) found"
6060
fi
6161
}
6262

6363
# Will return true even if deletion fails
6464
# $1 = group
6565
deleteGroup() {
6666
if hash delgroup 2>/dev/null; then
67-
delgroup --quiet --system $1 > /dev/null || true
67+
delgroup --quiet --system $1 > /dev/null || true
6868
elif hash groupdel 2>/dev/null; then
69-
groupdel $1
69+
groupdel $1
7070
else
71-
echo "WARNING: Could not delete user $1 . No suitable program (delgroup, groupdel) found"
71+
echo "WARNING: Could not delete user $1 . No suitable program (delgroup, groupdel) found"
7272
fi
7373
}
7474

0 commit comments

Comments
 (0)