From 1f1bf0b9d16f9a25b73d50adfe836b034cf3f574 Mon Sep 17 00:00:00 2001 From: Andoni del Olmo Date: Wed, 14 Dec 2022 20:40:41 +0100 Subject: [PATCH] document how to use Makefile --- Makefile | 9 +++--- README.md | 22 ++++++------- deb/DEBIAN/control | 2 +- package | 78 ---------------------------------------------- 4 files changed, 17 insertions(+), 94 deletions(-) delete mode 100755 package diff --git a/Makefile b/Makefile index 9c342b8..d0b36e1 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,14 @@ -#MAKEFLAGS += --silent +MAKEFLAGS += --silent -APP_HOME=usr/share/turtl +APP_HOME = usr/share/turtl TAR_FILE = turtl-linux-$(VERSION)-$(ARCH).tar.bz2 TAR_URL = https://github.com/turtl/desktop/releases/download/v$(VERSION)/turtl-$(VERSION)-linux$(TAR_ARCH).tar.bz2 VERSION = 0.7.2.6-pre-sync-fix +PACKAGE_VERSION = ~ado1 BUILD_DIR = build -RELEASE_DIR = $(BUILD_DIR)/release +RELEASE_DIR := $(realpath $(CURDIR)/..) TMP_DIR = $(BUILD_DIR)/tmp TAR_CACHE = $(BUILD_DIR)/$(TAR_FILE) PLATFORM := $(shell uname -m) @@ -54,4 +55,4 @@ cp: control: $(eval SIZE=$(shell du -sbk $(TMP_DIR)/ | grep -o '[0-9]*')) - sed -i "s/{{version}}/$(VERSION)/;s/{{size}}/$(SIZE)/;s/{{architecture}}/$(ARCH)/" $(TMP_DIR)/DEBIAN/control + sed -i "s/{{version}}/$(VERSION)$(PACKAGE_VERSION)/;s/{{size}}/$(SIZE)/;s/{{architecture}}/$(ARCH)/" $(TMP_DIR)/DEBIAN/control diff --git a/README.md b/README.md index a16f458..7aca22d 100644 --- a/README.md +++ b/README.md @@ -5,20 +5,20 @@ For more information about Turtl, please visit www.turtlapp.com ## How to install -``` - wget https://github.com/adelolmo/turtl-debian/releases/download/v0.7.2.6/turtl_0.7.2.6_amd64.deb - sudo dpkg -i turtl_0.7.2.6_amd64.deb -``` +Download the package from https://github.com/adelolmo/turtl-debian/releases and install it: + + sudo dpkg -i turtl_0.7.2.6_amd64.deb ## How to build - Download the script ```package``` and run it locally. - ``` - wget https://raw.githubusercontent.com/adelolmo/turtl-debian/master/turtl_deb - /bin/sh package 64|32 [version] - ``` - The first parameter is the system architecture, it must be 32 or 64. The second parameter is the version of Turtl, if it's not given it will use the latest version available in https://turtlapp.com - The debian package will be created under build/releases. + make + +Parameters available are `VERSION` and `ARCH`. e.g: + + make VERSION=0.7.2.6-pre-sync-fix ARCH=i386 + +Turtle comes precompiled for `amd64` and `i386` architectures. +For the available versions, please visit https://turtlapp.com ## Oficial Turtl server URL diff --git a/deb/DEBIAN/control b/deb/DEBIAN/control index 6b7de01..472b136 100644 --- a/deb/DEBIAN/control +++ b/deb/DEBIAN/control @@ -3,7 +3,7 @@ Version: {{version}} License: GPLv3 Vendor: Lyon Bros. Enterprises, LLC Architecture: {{architecture}} -Maintainer: info@turtlapp.com +Maintainer: andoni.delolmo@gmail.com Installed-Size: {{size}} Section: default Priority: extra diff --git a/package b/package deleted file mode 100755 index b871c15..0000000 --- a/package +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/sh -e - -TMP=build/tmp -RELEASE=build/releases - -rm -fr build -mkdir -p ${TMP} ${RELEASE} - -arch=64 -if [ -n "$1" ]; then - arch=$1 -fi - -version=$2 -if [ ! -n "$2" ]; then - version=$( wget https://turtlapp.com/download -O build/turtlhome > /dev/null 2>&1 && cat build/turtlhome | grep "linux$arch"|uniq| grep -oE "v.*/"|sed 's/v//g;s/\///g' ) -fi - -artifact=$3 -wget -O /tmp/turtl-linux.tar.bz2 ${artifact} - -echo "* Retrieve artifact ${arch} ${version} ..." -[ -f /tmp/turtl-linux.tar.bz2 ] || wget -O /tmp/turtl-linux${arch}.tar.bz2 https://github.com/turtl/desktop/releases/download/v${version}/turtl-${version}-linux${arch}.tar.bz2 - -echo "* Extract tar ..." -tar xf /tmp/turtl-linux.tar.bz2 -C build - -echo "* Prepare package directory ..." -mkdir -p ${TMP}/usr/share/turtl -cp -R build/turtl-linux*/turtl/* ${TMP}/usr/share/turtl - -echo "* Create icon ..." -mkdir -p ${TMP}/usr/share/pixmaps -mv build/turtl-linux*/turtl/icon.png ${TMP}/usr/share/pixmaps/turtl.png - -echo "* Create menu entry ..." -mkdir -p ${TMP}/usr/share/applications -cat > ${TMP}/usr/share/applications/turtl.desktop < ${TMP}/DEBIAN/control <