tMerge pull request #2 from alerque/master - gitzone - git-based zone management tool for static and dynamic domains
HTML git clone https://git.parazyd.org/gitzone
DIR Log
DIR Files
DIR Refs
---
DIR commit a7455c5fe894e9a026cdd00c4f3bf1d515ebc645
DIR parent 26dfd85ca5ff5cc79744494e1fa8727cedb3102c
HTML Author: Jaromil <jaromil@dyne.org>
Date: Sun, 16 Mar 2014 11:30:43 +0100
Merge pull request #2 from alerque/master
change non-function returns to exit for posix shell compliance
fix contributed by alerque on github
Diffstat:
M bin/gitzone-install | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
---
DIR diff --git a/bin/gitzone-install b/bin/gitzone-install
t@@ -24,19 +24,19 @@
if [ -z $1 ]; then
echo "usage: gitzone-install username [ id_rsa.pub ]";
- return 0; fi
+ exit 0; fi
uid="`id -u`"
if ! [ "$uid" = "0" ]; then
echo "this script needs to be run as root."
- return 1; fi
+ exit 1; fi
user="$1"
# check user argument
grep "^$user" /etc/passwd > /dev/null
-if ! [ $? = 0 ]; then echo "error: user not found: $user"; return 1; fi
-if ! [ -r /home/$user ]; then echo "error: user home not found: /home/$user"; return 1; fi
+if ! [ $? = 0 ]; then echo "error: user not found: $user"; exit 1; fi
+if ! [ -r /home/$user ]; then echo "error: user home not found: /home/$user"; exit 1; fi
if [ -r /home/$user/zones/$user/.git ]; then
echo "error: gitzone already installed for user $user";
else # create gitzone directory in user home
t@@ -98,12 +98,12 @@ EOF
key="$2" # add ssh key
-if [ -z "$key" ]; then return 0; fi
-if ! [ -r $key ]; then echo "warning: key not found $key"; return 1; fi
+if [ -z "$key" ]; then exit 0; fi
+if ! [ -r $key ]; then echo "warning: key not found $key"; exit 1; fi
mkdir -p /home/$user/.ssh
touch /home/$user/.ssh/authorized_keys
cat $key >> /home/$user/.ssh/authorized_keys
chmod -R go-rwx /home/$user/.ssh
chown -R $user:$user /home/$user/.ssh
echo "ssh public key $key added for $user"
-return 0
+exit 0