Correct some order of operations in make install

This commit is contained in:
Jansen Price 2020-10-03 23:51:27 -05:00
parent 15cd024b35
commit 33ab4eecdc
1 changed files with 3 additions and 3 deletions

View File

@ -24,7 +24,7 @@ test:
install_bin: install_bin:
@echo @echo
@echo "$(ccyellow)> Installing orbit bin$(ccend)" @echo "$(ccyellow)> Installing orbit bin$(ccend)"
rm $(EXEC_PATH) rm -f $(EXEC_PATH)
ln -s $(_path)/bin/orbit $(EXEC_PATH) ln -s $(_path)/bin/orbit $(EXEC_PATH)
install_conf: install_conf:
@ -53,7 +53,7 @@ install_user:
ifeq ($(shell id -u $(_user) 2>/dev/null),) ifeq ($(shell id -u $(_user) 2>/dev/null),)
@echo @echo
@echo "$(ccyellow)> Creating user $(_user)$(ccend)" @echo "$(ccyellow)> Creating user $(_user)$(ccend)"
useradd -m -d /var/$(_user) -s /usr/sbin/nologin -c "Orbit gemini service account" -U $(_user) useradd -m -d /var/gemini -s /usr/sbin/nologin -c "Orbit gemini service account" -U $(_user)
endif endif
install_service: install_service:
@ -62,7 +62,7 @@ install_service:
install orbit.service $(SERVICE_PATH) install orbit.service $(SERVICE_PATH)
sed -i -e 's/{USER}/$(_user)/' $(SERVICE_PATH) sed -i -e 's/{USER}/$(_user)/' $(SERVICE_PATH)
install: install_bin install_conf install_cert install_user install_service install: install_bin install_user install_conf install_cert install_service
@echo @echo
@echo "--------------------------------" @echo "--------------------------------"
@echo "done" @echo "done"