diff --git a/Makefile b/Makefile index 992cbcd..7087217 100644 --- a/Makefile +++ b/Makefile @@ -18,15 +18,15 @@ build: @if [ ! -d ${BUILDDIR} ]; then \ mkdir ${BUILDDIR}; \ fi - @echo -e "$(GREEN)[ $(YELLOW)25% $(GREEN)] $(RESET)CC SERVER" + @printf "$(GREEN)[ $(YELLOW)25%% $(GREEN)] $(RESET)CC SERVER\n" @$(CXX) -o $(BUILDDIR)server $(SRC_SERVER) $(CXX_FLAGS) - @echo -e "$(GREEN)[ $(YELLOW)50% $(GREEN)] $(RESET)CC CLIENT" + @printf "$(GREEN)[ $(YELLOW)50%% $(GREEN)] $(RESET)CC CLIENT\n" @$(CXX) -o $(BUILDDIR)client $(SRC_CLIENT) $(CXX_FLAGS) - @echo -e "$(GREEN)[ $(YELLOW)75% $(GREEN)] $(RESET)STRIP SERVER" + @printf "$(GREEN)[ $(YELLOW)75%% $(GREEN)] $(RESET)STRIP SERVER\n" @strip $(BUILDDIR)server >> /dev/null - @echo -e "$(GREEN)[ $(YELLOW)100% $(GREEN)] $(RESET)STRIP CLIENT" + @printf "$(GREEN)[ $(YELLOW)100%% $(GREEN)] $(RESET)STRIP CLIENT\n" @strip $(BUILDDIR)client >> /dev/null - @echo -e "$(GREEN)BUILD SUCCESS$(RESET)" + @printf "$(GREEN)BUILD SUCCESS$(RESET)\n" clean: @if [ -d ${BUILDDIR} ]; then \ @@ -43,26 +43,26 @@ install: @if [ ! -d ${DESTDIR} ]; then \ mkdir -p $(DESTDIR); \ fi - @echo -e "$(GREEN)[ $(YELLOW)50% $(GREEN)] $(RESET)INSTALL SERVER" + @printf "$(GREEN)[ $(YELLOW)50%% $(GREEN)] $(RESET)INSTALL SERVER\n" @cp -rf $(BUILDDIR)server $(DESTDIR)udpchatserver - @echo -e "$(GREEN)[ $(YELLOW)100% $(GREEN)] $(RESET)INSTALL CLIENT" + @printf "$(GREEN)[ $(YELLOW)100%% $(GREEN)] $(RESET)INSTALL CLIENT\n" @cp -rf $(BUILDDIR)client $(DESTDIR)udpchatclient - @echo -e "$(GREEN)INSTALL SUCCESS$(RESET)" + @printf "$(GREEN)INSTALL SUCCESS$(RESET)\n" debpkg: - @echo -e "$(GREEN)[ $(YELLOW)15% $(GREEN)] $(RESET)CREATE PACKAGE DIRECTORIES" + @printf "$(GREEN)[ $(YELLOW)15%% $(GREEN)] $(RESET)CREATE PACKAGE DIRECTORIES\n" @rm -rf $(DEBPACKAGENAME) @mkdir -p $(DEBPACKAGENAME)/usr/local/bin - @echo -e "$(GREEN)[ $(YELLOW)45% $(GREEN)] $(RESET)COPY PACKAGE FILES" + @printf "$(GREEN)[ $(YELLOW)45%% $(GREEN)] $(RESET)COPY PACKAGE FILES\n" @cp -rf $(BUILDDIR)server $(DEBPACKAGENAME)/usr/local/bin/udpchatserver @cp -rf $(BUILDDIR)client $(DEBPACKAGENAME)/usr/local/bin/udpchatclient - @echo -e "$(GREEN)[ $(YELLOW)75% $(GREEN)] $(RESET)CREATE PACKAGE METADATA" + @printf "$(GREEN)[ $(YELLOW)75%% $(GREEN)] $(RESET)CREATE PACKAGE METADATA\n" @mkdir $(DEBPACKAGENAME)/DEBIAN @touch $(DEBPACKAGENAME)/DEBIAN/control - @echo -e "$(GREEN)[ $(YELLOW)100% $(GREEN)] $(RESET)CREATE PACKAGE" - @echo -e "Package: udpchat\nVersion: 1.0.1\nArchitecture: $(ARCH)\nMaintainer: Tola Mironcenko \nDescription: This is small chat in terminal" >> $(DEBPACKAGENAME)/DEBIAN/control + @printf "$(GREEN)[ $(YELLOW)100%% $(GREEN)] $(RESET)CREATE PACKAGE\n" + @printf "Package: udpchat\nVersion: 1.0.1\nArchitecture: $(ARCH)\nMaintainer: Tola Mironcenko \nDescription: This is small chat in terminal\n" >> $(DEBPACKAGENAME)/DEBIAN/control @dpkg-deb --build --root-owner-group $(DEBPACKAGENAME) - @echo -e "$(GREEN)BUILDING DEBIAN PACKAGE SUCCESS$(RESET)" + @printf "$(GREEN)BUILDING DEBIAN PACKAGE SUCCESS$(RESET)\n" archlinuxpkg: @makepkg -f