From 074cc56b63e9073fa167d5d7003086d7c2b82586 Mon Sep 17 00:00:00 2001
From: snmsts <snmsts@gmail.com>
Date: Wed, 9 Oct 2024 16:06:08 +0900
Subject: [PATCH] edit Makefile

---
 Makefile | 41 +++++++++++++++++++----------------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/Makefile b/Makefile
index 0c207ce..14b93d4 100644
--- a/Makefile
+++ b/Makefile
@@ -3,20 +3,16 @@
 export $(shell sed 's/=.*//' .env)
 
 VERSION ?= $(shell date +%y.%-m.%-d)
-ORIGIN_URI=https://github.com/sbcl/sbcl
-ORIGIN_REF=master
-GITHUB=https://github.com/roswell/sbcl_head
 TSV_FILE ?= sbcl-bin_uri.tsv
-
-LAST_VERSION=$(shell ros web.ros version)
 WEB_ROS_URI=https://raw.githubusercontent.com/roswell/sbcl_bin/master/web.ros
 
-clean:
-	rm -f hash lasthash
+ORIGIN_URI=https://github.com/sbcl/sbcl
+ORIGIN_REF=master
+GITHUB=https://github.com/roswell/sbcl_head
 
 #version
 version: web.ros
-	@echo $(LAST_VERSION) > $@
+	@echo $(shell GH_USER=$(GH_USER) GH_REPO=$(GH_REPO) ros web.ros version) > $@
 branch: version
 	$(eval VERSION := $(shell cat version))
 	VERSION=$(VERSION) ros build.ros branch > $@
@@ -24,6 +20,19 @@ latest-uris: web.ros
 	ros web.ros latests
 web.ros:
 	curl -L -O $(WEB_ROS_URI)
+#tsv
+tsv: web.ros
+	TSV_FILE=$(TSV_FILE) ros web.ros tsv
+upload-tsv: web.ros
+	TSV_FILE=$(TSV_FILE) VERSION=$(VERSION) ros web.ros upload-tsv
+download-tsv: web.ros
+	VERSION=$(VERSION) ros web.ros get-tsv
+#table
+table: web.ros
+	ros web.ros table
+#archive
+upload-archive: web.ros
+	VERSION=$(VERSION) TARGET=$(ARCH) SUFFIX=$(SUFFIX) ros web.ros upload-archive
 #tag
 hash:
 	git ls-remote --heads $(ORIGIN_URI) $(ORIGIN_REF) |sed -r "s/^([0-9a-fA-F]*).*/\1/" > hash
@@ -36,18 +45,6 @@ tag: hash web.ros
 	( VERSION=$(VERSION) ros web.ros upload-hash; \
 	  VERSION=$(VERSION) ros web.ros upload-hash; \
 	  VERSION=files ros web.ros upload-hash)
-#tsv
-tsv: web.ros
-	TSV_FILE=$(TSV_FILE) ros web.ros tsv
-
-upload-tsv: web.ros
-	TSV_FILE=$(TSV_FILE) ros web.ros upload-tsv
 
-download-tsv: web.ros
-	VERSION=$(VERSION) ros web.ros get-tsv
-#table
-table: web.ros
-	ros web.ros table
-#archive
-upload-archive: web.ros
-	VERSION=$(VERSION) TARGET=$(ARCH) SUFFIX=$(SUFFIX) ros web.ros upload-archive
+clean:
+	rm -f hash lasthash