From 52265bd9427912a11d7c8bf33001700603755ae9 Mon Sep 17 00:00:00 2001 From: Gwenhael Le Moine Date: Tue, 15 Jun 2021 10:21:32 +0200 Subject: [PATCH] trunk instead of git --- l/hinnant-date/SlackBuild | 12 ++++++++---- wayland/wlroots/SlackBuild | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/l/hinnant-date/SlackBuild b/l/hinnant-date/SlackBuild index 6bb9479f..451e95c3 100755 --- a/l/hinnant-date/SlackBuild +++ b/l/hinnant-date/SlackBuild @@ -1,10 +1,12 @@ -#!/bin/sh +#!/bin/bash + +set -e # variables CWD=$(pwd) PRGNAM=$(basename $CWD) -VERSION=${VERSION:-$(date +"%Y.%m.%d_%H.%M")} +VERSION=${VERSION:-"trunk"} ARCH=${ARCH:-$(uname -m)} BUILD=1 @@ -27,12 +29,14 @@ mkdir -p $PKG # mise en place cd $TMP [ ! -e $REPOSITORY ] && git clone https://github.com/HowardHinnant/date.git $REPOSITORY +cd $REPOSITORY +git pull --all -VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" cp -R $REPOSITORY $TMP/$PRGNAM - cd $TMP/$PRGNAM +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$( cd $REPOSITORY && git log -1 --format=%h_%ad --date=format:%Y.%m.%d )" || git checkout $VERSION + # configuration cmake \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ diff --git a/wayland/wlroots/SlackBuild b/wayland/wlroots/SlackBuild index 82bd727f..69b9df33 100755 --- a/wayland/wlroots/SlackBuild +++ b/wayland/wlroots/SlackBuild @@ -3,7 +3,7 @@ set -e # variables -VERSION=${VERSION:-"git"} +VERSION=${VERSION:-"trunk"} BUILD=1 TAG=gwh @@ -32,7 +32,7 @@ git pull --all cp -R $REPOSITORY $TMP/ cd $TMP/$PRGNAM/ -[ "x$VERSION" == "xgit" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION +[ "x$VERSION" == "xtrunk" ] && VERSION="git_$(git log -1 --format=%h_%ad --date=format:%Y.%m.%d)" || git checkout $VERSION meson setup --prefix /usr --mandir /usr/man/ build/ ninja -C build/