From dbf996d888fcfb88bd48f81c90b5ce9e3dffe6fd Mon Sep 17 00:00:00 2001
From: Jesse Smith <jsmith@resonatingmedia.com>
Date: Sat, 5 May 2018 14:51:22 -0300
Subject: [PATCH] Fixed some problems in the Makefile which caused it to grab
 wrong version/user information for upload.

---
 Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index c091a70..562409a 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,8 @@ all install clean distclean:
 	$(MAKE) -C src $@
 
 PACKAGE=sysvinit
-VERSION=$(shell git describe --tags --abbrev=4 HEAD 2>/dev/null | tr %_ :~)
+VERSION=$(shell git describe --tags --abbrev=0 HEAD 2>/dev/null)
+GITLOGIN=$(shell git remote -v | head -n 1 | cut -f 1 -d '@' | sed 's/origin\t//g')
 override TARBALL=$(PACKAGE)-$(VERSION).tar.xz
 override TARBALL_LATEST=$(PACKAGE)-latest.tar.xz
 override SFTPBATCH=upload-$(VERSION)-sftpbatch
@@ -11,7 +12,7 @@ dist: $(TARBALL)
 	@echo "tarball $(TARBALL) ready"
 
 upload: $(SFTPBATCH)
-	echo @sftp -b $< dl.sv.nongnu.org:/releases/$(PACKAGE)
+	echo @sftp -b $< $(GITLOGIN)@dl.sv.nongnu.org:/releases/$(PACKAGE)
 
 $(SFTPBATCH): $(TARBALL).sig
 	@echo progress > $@