SliTaz Repositories

     1.1 --- a/ssfs-server	Mon Jun 13 20:57:43 2011 +0200
     1.2 +++ b/ssfs-server	Fri Jun 17 23:43:30 2011 +0200
     1.3 @@ -159,33 +159,34 @@
     1.4  
     1.5  case "$1" in
     1.6  	users)
     1.7 -		gettext -e "\nChecking:"; echo " /etc/passwd"
     1.8 +		echo "" && gettext "Checking:"; echo " /etc/passwd"
     1.9  		fgrep "Ssfs User" /etc/passwd | while read line
    1.10  		do
    1.11  			login=$(echo $line | cut -d ":" -f 1)
    1.12  			home="$root/home/$login"
    1.13  			usage=$(du -sm $home | awk '{print $1}')
    1.14  			config=$SSFS_USERS/$login.conf
    1.15 -			. $config || gettext -e "WARNING: No config file\n"
    1.16 +			. $config || gettext "WARNING: No config file"
    1.17  			user_info
    1.18  		done 
    1.19  		users=$(ls $SSFS_USERS | wc -l)
    1.20  		gettext "Users:"; echo -e " $users\n" ;;
    1.21  	adduser)
    1.22  		# Add a Ssfs user to the system with $HOME in chroot.
    1.23 -		[ -z "$login" ] && gettext -e "Missing user login name.\n" && exit 0
    1.24 -		[ -z "$id" ] && gettext -e "Missing user id.\n" && exit 0
    1.25 -		[ -z "$pass" ] && gettext -e "Missing user password.\n" && exit 0
    1.26 +		[ -z "$login" ] && gettext "Missing user login name." && exit 0
    1.27 +		[ -z "$id" ] && gettext "Missing user id." && exit 0
    1.28 +		[ -z "$pass" ] && gettext "Missing user password." && exit 0
    1.29  		user_paths
    1.30  
    1.31  		# We need chroot command allowed for users to chroot them on SSH
    1.32  		# login. Ssfs users have /bin/ssfs-sh as SHell.
    1.33  		grep -q ^chroot /etc/busybox.conf ||
    1.34  			echo 'chroot = ssx root.root' >> /etc/busybox.conf
    1.35 -		
    1.36 -		gettext -e "\nChecking:"; echo " /etc/passwd"
    1.37 +
    1.38 +		echo ""
    1.39 +		gettext "Checking:"; echo " /etc/passwd"
    1.40  		if grep ^$login: /etc/passwd; then
    1.41 -			gettext -e "Exiting, user already exists:"
    1.42 +			gettext "Exiting, user already exists:"
    1.43  			echo -e " $login\n" && exit 0
    1.44  		fi
    1.45  		
    1.46 @@ -214,9 +215,10 @@
    1.47  		[ ! -d "$SSFS_USERS" ] && mkdir -p $SSFS_USERS
    1.48  		user_config ;;
    1.49  	deluser)
    1.50 -		[ -z "$login" ] && gettext -e "Missing user login name.\n" && exit 0
    1.51 +		[ -z "$login" ] && gettext "Missing user login name." && exit 0
    1.52  		user_paths
    1.53 -		gettext -e "\nDeleting user:"; echo -n " $login..."
    1.54 +		echo ""
    1.55 +		gettext "Deleting user:"; echo -n " $login..."
    1.56  		sed -i /^$login:/d $root/etc/passwd
    1.57  		sed -i /^$login:/d $root/etc/group
    1.58  		deluser $login || status && status
    1.59 @@ -226,9 +228,11 @@
    1.60  		rm -rf $config && status
    1.61  		echo "" ;;
    1.62  	chroot)
    1.63 -		gettext -e "\nChanging root to:"; echo -e " $root\n"
    1.64 +		echo ""
    1.65 +		gettext "Changing root to:"; echo -e " $root\n"
    1.66  		chroot $root
    1.67 -		gettext -e "\nBack to the host system:"
    1.68 +		echo ""
    1.69 +		gettext "Back to the host system:"
    1.70  		echo -e " $(hostname)\n" ;;
    1.71  	note)
    1.72  		# Admin notes for users and displayed on the web interface.
    1.73 @@ -330,7 +334,7 @@
    1.74  	check-vdisk)
    1.75  		# Check vdisk with e2fsck.
    1.76  		echo ""
    1.77 -		gettext -e "Checking Ssfs virtual disk\n"
    1.78 +		gettext "Checking Ssfs virtual disk"; echo
    1.79  		separator
    1.80  		gettext "Virtual disk     : "; du -sh $vdisk
    1.81  		gettext "Filesystem usage : "; du -sh $root
    1.82 @@ -346,10 +350,11 @@
    1.83  	clean-vdisk)
    1.84  		# clean up the vdisk storage chroot.
    1.85  		if [ ! -d "$root/bin" ] || [ ! -d "$root/lib" ]; then
    1.86 -			gettext -e "No chroot found in:"; echo " $root"
    1.87 +			gettext "No chroot found in:"; echo " $root"
    1.88  			exit 0
    1.89  		fi
    1.90 -		gettext -e "\nCleaning virtual disk\n"
    1.91 +		echo ""
    1.92 +		gettext "Cleaning virtual disk\n"
    1.93  		separator
    1.94  		echo "Chroot path: $root"
    1.95  		cd $root