Browse Source

Better way to call all args except last atgs

old-stable
Mitesh Shah 11 years ago
parent
commit
a4e77db88e
  1. 11
      src/lib/ee_lib_git.sh
  2. 13
      src/lib/ee_lib_service.sh

11
src/lib/ee_lib_git.sh

@ -2,15 +2,13 @@
function ee_lib_git() function ee_lib_git()
{ {
for ee_git_dir in $@; do for ee_git_dir in ${@:1:$(($#-1))}; do
if [ $ee_git_dir != ${@: -1} ]; then
# Change directory # Change directory
cd $ee_git_dir || ee_lib_error "Unable to change directory $ee_git_dir, exit status = " $? cd $ee_git_dir || ee_lib_error "Unable to change directory $ee_git_dir, exit status = " $?
# Check .git # Check .git
if [ ! -d .git ]; then if [ ! -d .git ]; then
ee_lib_echo "Initialize Git on ${ee_git_dir}..." ee_lib_echo "Initialize Git on ${ee_git_dir}"
git init &>> $EE_COMMAND_LOG \ git init &>> $EE_COMMAND_LOG \
|| ee_lib_error "Unable to initialize Git on $ee_git_dir, exit status = " $? || ee_lib_error "Unable to initialize Git on $ee_git_dir, exit status = " $?
fi fi
@ -18,10 +16,9 @@ function ee_lib_git()
# Check for untracked files # Check for untracked files
if [ $(git status -s | wc -l) -ne 0 ]; then if [ $(git status -s | wc -l) -ne 0 ]; then
# Add files in Git version control # Add files in Git version control
ee_lib_echo "Committing changes inside $EE_GIT_DIR, please wait..." ee_lib_echo "Git commit on $ee_git_dir, please wait..."
git add --all && git commit -am ${@: -1} &>> $EE_COMMAND_LOG \ git add --all && git commit -am "${@: -1}" &>> $EE_COMMAND_LOG \
|| ee_lib_error "Unable to Git commit on $ee_git_dir, exit status = " $? || ee_lib_error "Unable to Git commit on $ee_git_dir, exit status = " $?
fi fi
fi
done done
} }

13
src/lib/ee_lib_service.sh

@ -6,15 +6,12 @@
function ee_lib_service() function ee_lib_service()
{ {
for ee_service_name in $@; do for ee_service_name in ${@:1:$(($#-1))}; do
if [ $ee_service_name != ${@: -1} ]; then
# Display message # Display message
ee_lib_echo "Executing service $ee_service_name ${@: -1}, please wait..." ee_lib_echo "Executing service $ee_service_name ${@: -1}, please wait..."
# Check nginx and php5-fpm test before start/stop/restart/reload # Check nginx and php5-fpm test before start/stop/restart/reload
if [ $ee_service_name = "nginx" ]; then if [ $ee_service_name = "nginx" ]; then
# Adjust nginx server_names_hash_bucket_size # Adjust nginx server_names_hash_bucket_size
$ee_service_name -t 2>&1 | grep server_names_hash_bucket_size &>> $EE_COMMAND_LOG $ee_service_name -t 2>&1 | grep server_names_hash_bucket_size &>> $EE_COMMAND_LOG
if [ $? -eq 0 ];then if [ $? -eq 0 ];then
@ -22,27 +19,19 @@ function ee_lib_service()
EE_NGINX_SET_BUCKET=$(echo "2^$EE_NGINX_CALCULATION" | bc -l 2> /dev/null) EE_NGINX_SET_BUCKET=$(echo "2^$EE_NGINX_CALCULATION" | bc -l 2> /dev/null)
sed -i "s/.*server_names_hash_bucket_size.*/\tserver_names_hash_bucket_size $EE_NGINX_SET_BUCKET;/" /etc/nginx/nginx.conf sed -i "s/.*server_names_hash_bucket_size.*/\tserver_names_hash_bucket_size $EE_NGINX_SET_BUCKET;/" /etc/nginx/nginx.conf
fi fi
# Test and start/stop/restart/reload nginx service # Test and start/stop/restart/reload nginx service
$ee_service_name -t &>> $EE_COMMAND_LOG \ $ee_service_name -t &>> $EE_COMMAND_LOG \
&& service $ee_service_name ${@: -1} &>> $EE_COMMAND_LOG \ && service $ee_service_name ${@: -1} &>> $EE_COMMAND_LOG \
|| ee_lib_error "Unable to execute service $ee_service_name ${@: -1}, exit status = " $? || ee_lib_error "Unable to execute service $ee_service_name ${@: -1}, exit status = " $?
elif [ $ee_service_name = "php5-fpm" ]; then elif [ $ee_service_name = "php5-fpm" ]; then
# Test and start/stop/restart/reload php5-fpm service # Test and start/stop/restart/reload php5-fpm service
$ee_service_name -t &>> $EE_COMMAND_LOG \ $ee_service_name -t &>> $EE_COMMAND_LOG \
&& service $ee_service_name ${@: -1} &>> $EE_COMMAND_LOG\ && service $ee_service_name ${@: -1} &>> $EE_COMMAND_LOG\
|| ee_lib_error "Unable to execute service $ee_service_name ${@: -1}, exit status = " $? || ee_lib_error "Unable to execute service $ee_service_name ${@: -1}, exit status = " $?
else else
# start/stop/restart/reload services # start/stop/restart/reload services
service $ee_service_name ${@: -1} &>> $EE_COMMAND_LOG \ service $ee_service_name ${@: -1} &>> $EE_COMMAND_LOG \
|| ee_lib_error "Unable to execute service $ee_service_name ${@: -1}, exit status = " $? || ee_lib_error "Unable to execute service $ee_service_name ${@: -1}, exit status = " $?
fi
fi fi
done done
} }

Loading…
Cancel
Save