SketchyMaze/doodle
SketchyMaze/doodle
1
0
Fork 0
Code Issues 41 Pull Requests 1 Releases Wiki Activity

Fix version parsing on Makefiles

Browse Source
This commit is contained in:
Noah 2020-06-05 00:02:06 -07:00
parent eae7258ce1
commit cb155c8750
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
SHELL := /bin/bash SHELL := /bin/bash
VERSION=$(shell grep -e 'Version =' pkg/branding/branding.go | head -n 1 | cut -d '"' -f 2) VERSION=$(shell egrep -e 'Version\s+=' pkg/branding/branding.go | head -n 1 | cut -d '"' -f 2)
BUILD=$(shell git describe --always) BUILD=$(shell git describe --always)
BUILD_DATE=$(shell date +"%Y-%m-%dT%H:%M:%S%z") BUILD_DATE=$(shell date +"%Y-%m-%dT%H:%M:%S%z")
CURDIR=$(shell curdir) CURDIR=$(shell curdir)

6
scripts/fpm-bundle.sh
View File

@ -2,7 +2,7 @@
# fpm-bundle: create bundles for the app. # fpm-bundle: create bundles for the app.
VERSION=`grep -e 'Version =' ../../pkg/branding/branding.go | head -n 1 | cut -d '"' -f 2` VERSION=`egrep -e 'Version\s+=' ../../pkg/branding/branding.go | head -n 1 | cut -d '"' -f 2`
INSTALL_ROOT="/opt/project-doodle" INSTALL_ROOT="/opt/project-doodle"
LAUNCHER_FILE="../../etc/linux/net.kirsle.ProjectDoodle.desktop" LAUNCHER_FILE="../../etc/linux/net.kirsle.ProjectDoodle.desktop"
LAUNCHER_ROOT="/usr/share/applications" # Where the .desktop file goes. LAUNCHER_ROOT="/usr/share/applications" # Where the .desktop file goes.
@ -45,7 +45,7 @@ echo =====================
fpm -C ./root -s dir -t rpm \ fpm -C ./root -s dir -t rpm \
-d SDL2 -d SDL2_ttf -a x86_64 \ -d SDL2 -d SDL2_ttf -a x86_64 \
-n project-doodle -v ${VERSION} \ -n project-doodle -v ${VERSION} \
--license="Copyright only" \ --license="Copyright" \
--maintainer=noah@kirsle.net \ --maintainer=noah@kirsle.net \
--description="Project: Doodle - A drawing-based maze game." \ --description="Project: Doodle - A drawing-based maze game." \
--url="https://www.kirsle.net/doodle" --url="https://www.kirsle.net/doodle"
@ -54,7 +54,7 @@ fpm -C ./root -s dir -t rpm \
fpm -C ./root -s dir -t deb \ fpm -C ./root -s dir -t deb \
-d libsdl2 -d libsdl2-ttf -a x86_64 \ -d libsdl2 -d libsdl2-ttf -a x86_64 \
-n project-doodle -v ${VERSION} \ -n project-doodle -v ${VERSION} \
--license="Copyright only" \ --license="Copyright" \
--maintainer=noah@kirsle.net \ --maintainer=noah@kirsle.net \
--description="Project: Doodle - A drawing-based maze game." \ --description="Project: Doodle - A drawing-based maze game." \
--url="https://www.kirsle.net/doodle" --url="https://www.kirsle.net/doodle"