Skip to content

Commit b53127b

Browse files
committed
Fixing github tasts on macos
1 parent 11af447 commit b53127b

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

Diff for: Makefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
SHELL := bash
22
INSTALL ?= install
3+
REALPATH := $(shell if [ $OSTYPE == 'darwin'* ]; then echo grealpath; else echo realpath; fi)
34

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

2728
# Docker variables:
2829
DOCKER_TAG ?= 0.0.6

Diff for: test/setup

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
set -e
44

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

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

0 commit comments

Comments
 (0)