Skip to content

Commit

Permalink
Fix portability issues
Browse files Browse the repository at this point in the history
  • Loading branch information
xrobau committed May 29, 2019
1 parent db67994 commit 7bf5f01
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ SMTP_PASSWORD ?= password

VERSION := $(shell date +%Y%m%d).$(BUILD)

SSHAGENT = -v $(shell readlink -f ${SSH_AUTH_SOCK}):/ssh-agent -e SSH_AUTH_SOCK=/ssh-agent
SSHAGENT = -v $(shell [ -e /usr/bin/readlink ] && /usr/bin/readlink -f ${SSH_AUTH_SOCK} || echo /dev/null):/ssh-agent -e SSH_AUTH_SOCK=/ssh-agent
PARAMS = --name=$(NAME) -p $(UFPORT):80 $(SSHAGENT) -e DEVMODE=true --network=uf_default $(MOUNTS) $(ENVVARS)

MOUNTS = -v $(shell pwd)/git/userfrosting:/var/www -v $(shell pwd)/git/userfrosting/public:/var/www/html $(SMOUNTS) $(COMPOSERMOUNT)
Expand All @@ -36,7 +36,9 @@ endif
# Pull UserFrosting from git and rebuild if the json changes
PACKAGES := packages/userfrosting.tar.bz2

USERFROSTING_REPO = [email protected]:userfrosting/UserFrosting.git
# If you have a valid SSH key, use ssh instead of https
#USERFROSTING_REPO = [email protected]:userfrosting/UserFrosting.git
USERFROSTING_REPO = https://github.com/userfrosting/UserFrosting.git
USERFROSTING_BRANCH = origin/master
USERFROSTING_MOUNT = /var/www/

Expand Down

0 comments on commit 7bf5f01

Please sign in to comment.