Skip to content

Update bash completion location #356

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

Open
zanix wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Update bash completion location #356

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
21 changes: 15 additions & 6 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,16 @@ MSCS := /usr/local/bin/mscs
MSCS_INIT_D := /etc/init.d/mscs
MSCS_SERVICE := /etc/systemd/system/mscs.service
MSCS_SERVICE_TEMPLATE := /etc/systemd/system/mscs@.service
MSCS_COMPLETION := /etc/bash_completion.d/mscs

# Bash completion: detect proper location
BASH_COMPLETION_DIR := $(shell \
if [ -d /usr/share/bash-completion/completions ]; then \
echo /usr/share/bash-completion/completions; \
else \
echo /etc/bash_completion.d; \
fi)

MSCS_COMPLETION := $(BASH_COMPLETION_DIR)/mscs

UPDATE_D := $(wildcard update.d/*)

Expand All @@ -21,12 +30,12 @@ install: adduser update
fi

adduser:
# safety check to see if user exists before trying to create it
# safety check to see if user exists before trying to create it
if id $(MSCS_USER); then \
echo "Minecraft user $(MSCS_USER) exists so not creating it"; \
else \
useradd --system --user-group --create-home -K UMASK=0022 --home $(MSCS_HOME) $(MSCS_USER); \
fi
echo "Minecraft user $(MSCS_USER) exists so not creating it"; \
else \
useradd --system --user-group --create-home -K UMASK=0022 --home $(MSCS_HOME) $(MSCS_USER); \
fi

update:
install -m 0755 msctl $(MSCTL)
Expand Down