mirror of
				https://github.com/wting/autojump
				synced 2025-06-13 12:54:07 +00:00 
			
		
		
		
	only use git revision for version if .git exists
This commit is contained in:
		
							parent
							
								
									ae0e928e60
								
							
						
					
					
						commit
						52a8ee42ed
					
				
							
								
								
									
										1
									
								
								Makefile
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								Makefile
									
									
									
									
									
								
							@ -6,7 +6,6 @@ autojump: autojump.py
 | 
			
		||||
version=`git describe $$(git rev-list --tags --max-count=1)`
 | 
			
		||||
number=`git describe $$(git rev-list --tags --max-count=1) | sed "s/^[a-z]*-//"`
 | 
			
		||||
release:
 | 
			
		||||
	echo $(TAG)
 | 
			
		||||
	@echo NOTE: make sure you\'re on a tagged commit
 | 
			
		||||
	git archive --format=tar --prefix autojump_$(number)/ $(version) | gzip > autojump_$(number).tar.gz
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -1,10 +1,13 @@
 | 
			
		||||
#!/usr/bin/env bash
 | 
			
		||||
# add git revision to autojump
 | 
			
		||||
gitrevision=`git describe`
 | 
			
		||||
if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
 | 
			
		||||
    gitrevision=$gitrevision"-dirty"
 | 
			
		||||
if [ -d .git ];
 | 
			
		||||
then
 | 
			
		||||
	# add git revision to autojump
 | 
			
		||||
	gitrevision=`git describe`
 | 
			
		||||
	if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
 | 
			
		||||
		gitrevision=$gitrevision"-dirty"
 | 
			
		||||
	fi
 | 
			
		||||
	sed -e "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"git revision $gitrevision\"/" autojump.py > autojump
 | 
			
		||||
else
 | 
			
		||||
	cp autojump.py autojump
 | 
			
		||||
fi
 | 
			
		||||
sed -e "s/^AUTOJUMP_VERSION = \".*\"$/AUTOJUMP_VERSION = \"git revision $gitrevision\"/" autojump.py > autojump
 | 
			
		||||
chmod a+rx autojump
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
	chmod a+rx autojump
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user