Browse Source

Replace exit 1 by return 1 in functions

Serj Kalichev 9 years ago
parent
commit
8cf492b209
1 changed files with 25 additions and 25 deletions
  1. 25 25
      scripts/rfa

+ 25 - 25
scripts/rfa

@@ -149,17 +149,17 @@ repository_add()
 	for rep_name in "$@"; do
 		repo_root=`find_repo_root "$rep_name"`
 		repo_link=`find_repo_link "$rep_name"`
-		test "x$repo_root" = "x" || { echo "Error: The repository \"$rep_name\" already exists." 1>&2; exit 1; }
+		test "x$repo_root" = "x" || { echo "Error: The repository \"$rep_name\" already exists." 1>&2; return 1; }
 		eval repo_root="\$repository_${opts_vcs}_root"
 		eval repo_link="\$repository_${opts_vcs}_link"
-		test "x$repo_root" = "x" && { echo "Error: Illegal repository root \"\"" 1>&2; exit 1; }
-		test "x$repo_link" = "x" && { echo "Error: Illegal repository link \"\"" 1>&2; exit 1; }
-		test -d "$repo_root" || { echo "Error: Illegal repository root \"$repo_root\"" 1>&2; exit 1; }
-		test -d "$repo_link" || { echo "Error: Illegal repository link \"$repo_link\"" 1>&2; exit 1; }
-		group_add "$rep_name" || { echo "Error: Can't add group for repository \"$rep_name\"" 1>&2; exit 1; }
-		data_add "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't add repository \"$rep_name\"" 1>&2; exit 1; }
-		data_fixmod "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't fix mode for repository \"$rep_name\"" 1>&2; exit 1; }
-		link_add "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't add link for repository \"$rep_name\"" 1>&2; exit 1; }
+		test "x$repo_root" = "x" && { echo "Error: Illegal repository root \"\"" 1>&2; return 1; }
+		test "x$repo_link" = "x" && { echo "Error: Illegal repository link \"\"" 1>&2; return 1; }
+		test -d "$repo_root" || { echo "Error: Illegal repository root \"$repo_root\"" 1>&2; return 1; }
+		test -d "$repo_link" || { echo "Error: Illegal repository link \"$repo_link\"" 1>&2; return 1; }
+		group_add "$rep_name" || { echo "Error: Can't add group for repository \"$rep_name\"" 1>&2; return 1; }
+		data_add "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't add repository \"$rep_name\"" 1>&2; return 1; }
+		data_fixmod "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't fix mode for repository \"$rep_name\"" 1>&2; return 1; }
+		link_add "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't add link for repository \"$rep_name\"" 1>&2; return 1; }
 		echo "Info: The repository \"$rep_name\" was succesfully created."
 	done
 }
@@ -175,14 +175,14 @@ repository_del()
 	for rep_name in "$@"; do
 		repo_root=`find_repo_root "$rep_name"`
 		repo_link=`find_repo_link "$rep_name"`
-		test "x$repo_root" = "x" -o "x$repo_link" = "x" && { echo "Error: Can't find repository \"$rep_name\"" 1>&2; exit 1; }
+		test "x$repo_root" = "x" -o "x$repo_link" = "x" && { echo "Error: Can't find repository \"$rep_name\"" 1>&2; return 1; }
 		if test "x$opts_force" = "x"; then
 			read -r -p "Deleting repository \"$rep_name\". Are you sure (y/n)? " sure
 			test "x$sure" = "xy" -o "x$sure" = "xY" || { echo "Info: The repository \"$rep_name\" will be not deleted."; continue; }
 		fi
-		link_del "$rep_name" "$repo_link" || { echo "Error: Can't remove link for repository \"$rep_name\"" 1>&2; exit 1; }
-		data_del "$rep_name" "$repo_root" || { echo "Error: Can't remove repository \"$rep_name\"" 1>&2; exit 1; }
-		group_del "$rep_name" || { echo "Error: Can't remove group for repository \"$rep_name\"" 1>&2; exit 1; }
+		link_del "$rep_name" "$repo_link" || { echo "Error: Can't remove link for repository \"$rep_name\"" 1>&2; return 1; }
+		data_del "$rep_name" "$repo_root" || { echo "Error: Can't remove repository \"$rep_name\"" 1>&2; return 1; }
+		group_del "$rep_name" || { echo "Error: Can't remove group for repository \"$rep_name\"" 1>&2; return 1; }
 		echo "Info: The repository \"$rep_name\" was succesfully deleted."
 	done
 }
@@ -197,9 +197,9 @@ repository_fixmod()
 	for rep_name in "$@"; do
 		repo_root=`find_repo_root "$rep_name"`
 		repo_link=`find_repo_link "$rep_name"`
-		test "x$repo_root" = "x" -o "x$repo_link" = "x" && { echo "Error: Can't find repository \"$rep_name\"" 1>&2; exit 1; }
-		data_fixmod "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't fix repository's \"$rep_name\" mode" 1>&2; exit 1; }
-		link_add "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't create link for repository \"$rep_name\"" 1>&2; exit 1; }
+		test "x$repo_root" = "x" -o "x$repo_link" = "x" && { echo "Error: Can't find repository \"$rep_name\"" 1>&2; return 1; }
+		data_fixmod "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't fix repository's \"$rep_name\" mode" 1>&2; return 1; }
+		link_add "$rep_name" "$repo_root" "$repo_link" || { echo "Error: Can't create link for repository \"$rep_name\"" 1>&2; return 1; }
 		echo "Info: The repository \"$rep_name\" was succesfully fixed."
 	done
 }
@@ -276,7 +276,7 @@ user_add()
 		;;
 	*)
 		echo "Error: Illegal parameter \"$1\"" 1>&2
-		exit 1
+		return 1
 		;;
 	esac
 	shift
@@ -308,7 +308,7 @@ user_del()
 		;;
 	*)
 		echo "Error: Illegal parameter \"$1\"" 1>&2
-		exit 1
+		return 1
 		;;
 	esac
 	shift
@@ -340,7 +340,7 @@ user_del_all()
 		;;
 	*)
 		echo "Error: Illegal parameter \"$1\"" 1>&2
-		exit 1
+		return 1
 		;;
 	esac
 
@@ -473,19 +473,19 @@ test "x$repository_svn_link" = "x" && repository_svn_link="$repository_link"
 case "$action" in
 "info")
 	test $# -lt 1 && { echo "Error: Repository name is expected" 1>&2; exit 1; }
-	repository_info "$@"
+	repository_info "$@" || exit 1
 	;;
 "add")
 	test $# -lt 1 && { echo "Error: Repository name is expected" 1>&2; exit 1; }
-	repository_add "$@"
+	repository_add "$@" || exit 1
 	;;
 "del")
 	test $# -lt 1 && { echo "Error: Repository name is expected" 1>&2; exit 1; }
-	repository_del "$@"
+	repository_del "$@" || exit 1
 	;;
 "fixmod")
 	test $# -lt 1 && { echo "Error: Repository name is expected" 1>&2; exit 1; }
-	repository_fixmod "$@"
+	repository_fixmod "$@" || exit 1
 	;;
 "rename")
 	test $# -lt 2 && { echo "Error: The old and new repository names are expected" 1>&2; exit 1; }
@@ -493,11 +493,11 @@ case "$action" in
 	;;
 "adduser"|"useradd")
 	test $# -lt 3 && { echo "Error: Not enough parameters" 1>&2; exit 1; }
-	user_add "$@"
+	user_add "$@" || exit 1
 	;;
 "deluser"|"userdel")
 	test $# -lt 3 && { echo "Error: Not enough parameters" 1>&2; exit 1; }
-	user_del "$@"
+	user_del "$@" || exit 1
 	;;
 "deluser-all"|"userdel-all")
 	test $# -lt 2 && { echo "Error: Not enough parameters" 1>&2; exit 1; }