Skip to content

Simpify one-liner "if" conditionals #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lonyelon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Simpify one-liner "if" conditionals #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 10 additions & 16 deletions git-auto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,18 +60,16 @@ shift $((OPTIND - 1))

if [ "$allow_multiple" = 0 ]; then
if pidof -o $$ -x "$script_name" >/dev/null; then
echo "$script_name already running"
echo "$script_name already running" >&2
exit 1
fi
fi

if [ -d "${directory-}" ]; then
cd "$directory"
fi
[ -d "${directory-}" ] \
&& cd "$directory" \
|| echo "Given directory ($directory) does not exist." >&2

if [ -z "${branch-}" ]; then
branch=$(git rev-parse --abbrev-ref HEAD)
fi
[ -z "${branch-}" ] && branch=`git rev-parse --abbrev-ref HEAD`

get_commit_message() {
if [ -z "${commit_message-}" ]; then
Expand All @@ -91,20 +89,16 @@ auto_commit() {
fi

if [ 1 = "$push_to_server" ]; then

if [ 1 = "$rebase" ]; then
git pull --rebase "$server" "$branch"
else
git pull "$server" "$branch"
fi
[ 1 = "$rebase" ] \
&& git pull --rebase "$server" "$branch" \
|| git pull "$server" "$branch"
git push "$server" "$branch"

fi
}

if [ 1 = "$commit_on_exit" ] && [ 0 = "$once" ]; then
trap 'kill "$sleep_bg" 2>/dev/null; auto_commit; exit "$?"' INT HUP QUIT TERM
fi
[ 1 = "$commit_on_exit" ] && [ 0 = "$once" ] \
&& trap 'kill "$sleep_bg" 2>/dev/null; auto_commit; exit "$?"' INT HUP QUIT TERM

if [ 1 = "$once" ]; then
auto_commit
Expand Down