Skip to content
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

Makefile関連ファイルのディレクトリを移動 #73

Merged
merged 1 commit into from
Jul 17, 2023
Merged

Makefile関連ファイルのディレクトリを移動 #73

Show file tree
Hide file tree
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
18 changes: 9 additions & 9 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Variables
MAKEFILE_PATH := $(realpath $(dir $(lastword $(MAKEFILE_LIST))))
BIN_PATH := $(MAKEFILE_PATH)/bin
INSTALL_SCRIPTS_PATH := $(MAKEFILE_PATH)/install-scripts
DOTFILES_CONF_PATH := $(if $(XDG_CONFIG_HOME),$(XDG_CONFIG_HOME),$(HOME)/.config)

UNAME_S := $(shell uname -s)
Expand All @@ -9,7 +9,7 @@ ifeq ($(UNAME_S), Linux)
OS_NAME := $(shell grep -e ^ID= /etc/os-release | awk -F'[=]' '{ print $$2 }')
endif

include $(BIN_PATH)/colors.mk
include $(INSTALL_SCRIPTS_PATH)/colors.mk

.DEFAULT_GOAL := help

Expand All @@ -22,17 +22,17 @@ install: ## Install packages
ifeq ($(UNAME_S), Linux)
@echo "${WHITE}${BOLD}$(UNAME_S) - $(UNAME_P)${RESET}"
@echo "${WHITE}${BOLD}Distribution is $(OS_NAME)${RESET}"
@echo "${PURPLE}${BOLD}▓▒░ $(BIN_PATH)/install-$(OS_NAME).mk を実行します${RESET}"
@$(MAKE) -f $(BIN_PATH)/install-$(OS_NAME).mk --no-print-directory
@echo "${PURPLE}${BOLD}▓▒░ $(INSTALL_SCRIPTS_PATH)/install-$(OS_NAME).mk を実行します${RESET}"
@$(MAKE) -f $(INSTALL_SCRIPTS_PATH)/install-$(OS_NAME).mk --no-print-directory
endif
ifeq ($(UNAME_S), Darwin)
@echo "${WHITE}${BOLD}$(UNAME_S) - $(UNAME_P)${RESET}"
@echo "${PURPLE}${BOLD}▓▒░ $(BIN_PATH)/install-macos.mk を実行します${RESET}"
@$(MAKE) -f $(BIN_PATH)/install-macos.mk --no-print-directory
@echo "${PURPLE}${BOLD}▓▒░ $(INSTALL_SCRIPTS_PATH)/install-macos.mk を実行します${RESET}"
@$(MAKE) -f $(INSTALL_SCRIPTS_PATH)/install-macos.mk --no-print-directory
endif

create-symlinks: ## Create symbolic links
@$(MAKE) -f $(BIN_PATH)/symlinks.mk --no-print-directory
@$(MAKE) -f $(INSTALL_SCRIPTS_PATH)/symlinks.mk --no-print-directory

init: ## Initialize settings
@echo "${GREEN}▓▒░ Fisher update${RESET}"
Expand All @@ -41,10 +41,10 @@ init: ## Initialize settings
@fish -c '$(HOME)/.local/share/aquaproj-aqua/bin/aqua i -a'

doctor: ## Troubleshooting
@$(MAKE) -f $(BIN_PATH)/doctor.mk --no-print-directory
@$(MAKE) -f $(INSTALL_SCRIPTS_PATH)/doctor.mk --no-print-directory

ascii-art: ## Print a ascii-art
@$(MAKE) -f $(BIN_PATH)/ascii.mk --no-print-directory
@$(MAKE) -f $(INSTALL_SCRIPTS_PATH)/ascii.mk --no-print-directory

help: ## Help
@awk 'BEGIN {FS = ":.*##"} /^[0-9a-zA-Z_-]+:.*?##/ { printf " \033[36m%-17s\033[0m %s\n", $$1, $$2 } /^##@/ { printf "\n\033[1m%s\033[0m\n", substr($$0, 5) } ' $(MAKEFILE_LIST)
2 changes: 1 addition & 1 deletion bin/ascii.mk → install-scripts/ascii.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ define ASCII_ART
endef
export ASCII_ART

include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

.PHONY: ascii-art

Expand Down
0 bin/colors.mk → install-scripts/colors.mk
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions bin/doctor.mk → install-scripts/doctor.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

CHECK_COMMANDS := fish starship gh exa tree fd bat fzf zoxide nvim
CHECK_COMMANDS := fish bat dog erd exa fd fzf gh nvim starship zoxide

all: $(CHECK_COMMANDS)

Expand Down
2 changes: 1 addition & 1 deletion install-scripts/install-aquaproj.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

.PHONY: $(shell cat $(MAKEFILE_LIST) | awk -F':' '/^[a-z0-9_-]+:/ {print $$1}')

Expand Down
2 changes: 1 addition & 1 deletion bin/install-debian.mk → install-scripts/install-debian.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

MAKEFILE_PATH := $(shell dirname $(realpath $(dir $(lastword $(MAKEFILE_LIST)))))
INSTALL_SCRIPTS := $(MAKEFILE_PATH)/install-scripts
Expand Down
2 changes: 1 addition & 1 deletion install-scripts/install-fisher.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

.PHONY: $(shell cat $(MAKEFILE_LIST) | awk -F':' '/^[a-z0-9_-]+:/ {print $$1}')

Expand Down
2 changes: 1 addition & 1 deletion install-scripts/install-iterm2-shell-integration.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

.PHONY: $(shell cat $(MAKEFILE_LIST) | awk -F':' '/^[a-z0-9_-]+:/ {print $$1}')

Expand Down
2 changes: 1 addition & 1 deletion bin/install-macos.mk → install-scripts/install-macos.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

MAKEFILE_PATH := $(shell dirname $(realpath $(dir $(lastword $(MAKEFILE_LIST)))))
INSTALL_SCRIPTS := $(MAKEFILE_PATH)/install-scripts
Expand Down
2 changes: 1 addition & 1 deletion bin/install-ubuntu.mk → install-scripts/install-ubuntu.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

MAKEFILE_PATH := $(shell dirname $(realpath $(dir $(lastword $(MAKEFILE_LIST)))))
INSTALL_SCRIPTS := $(MAKEFILE_PATH)/install-scripts
Expand Down
2 changes: 1 addition & 1 deletion bin/symlinks.mk → install-scripts/symlinks.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
include $(PWD)/bin/colors.mk
include $(PWD)/install-scripts/colors.mk

MAKEFILE_PATH := $(shell dirname $(realpath $(dir $(lastword $(MAKEFILE_LIST)))))
DOTFILES_CONFIG_PATH := $(MAKEFILE_PATH)/.config
Expand Down