Skip to content

Commit

Permalink
Fixing github tasts on macos
Browse files Browse the repository at this point in the history
  • Loading branch information
spog committed Nov 23, 2024
1 parent 11af447 commit b53127b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
SHELL := bash
INSTALL ?= install
REALPATH := $(shell if [ $OSTYPE == 'darwin'* ]; then echo grealpath; else echo realpath; fi)

# Make sure we have git:
ifeq ($(shell which git),)
Expand All @@ -22,7 +23,7 @@ INSTALL_BIN ?= $(PREFIX)/bin
INSTALL_LIB ?= $(PREFIX)/share/$(NAME)
INSTALL_EXT ?= $(INSTALL_LIB)/$(NAME).d
INSTALL_MAN1 ?= $(PREFIX)/share/man/man1
LINK_REL_DIR := $(shell realpath --relative-to=$(INSTALL_BIN) $(INSTALL_LIB))
LINK_REL_DIR := $(shell $(REALPATH) --relative-to=$(INSTALL_BIN) $(INSTALL_LIB))

# Docker variables:
DOCKER_TAG ?= 0.0.6
Expand Down
4 changes: 3 additions & 1 deletion test/setup
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@

set -e

export LC_ALL=C.UTF-8
if [[ $OSTYPE != 'darwin'* ]]; then
export LC_ALL=C.UTF-8
fi

# Get the location of this script
SCRIPT_DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
Expand Down

0 comments on commit b53127b

Please # to comment.