Commit b43f7069 authored by Hugh Davenport's avatar Hugh Davenport

Fix cleanscript in Makefile

Two things:
1- There is a bug with the (no branch), the test wasn't wrapped in quotes
so bash was complaining
2- There was a bug with the empty branch

Change-Id: I241c18ee4e6980670b3cd5b6c79bcc6ef073c408
Signed-off-by: default avatarHugh Davenport <hugh@catalyst.net.nz>
parent cd02bcba
......@@ -15,7 +15,7 @@ ifeq (, $(branch))
branch := $(shell bash -c "git branch | grep \* | sed -e 's/ *\* *//'" )
endif
ifeq ("(no branch)", $(branch))
ifeq ("(no branch)", "$(branch)")
remote := origin
else
remote := $(shell bash -c "git config --get branch.$(branch).remote" )
......@@ -24,7 +24,7 @@ endif
ifeq (., $(remote))
remote := origin
endif
ifeq (, $(remote))
ifeq ("", $(remote))
remote := origin
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment