From e6797e0303f8da5959fa285169e1fb5e5ef94b0d Mon Sep 17 00:00:00 2001 From: GeigerCounter Date: Fri, 31 Mar 2017 09:26:12 -0400 Subject: [PATCH] Packaging scripts passed install test. --- tools/build-packages.sh | 22 ++++++++++++++++++++++ tools/build-rpm.sh | 2 +- tools/compile-linux.sh | 2 ++ tools/micro.spec | 14 +++++++------- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/tools/build-packages.sh b/tools/build-packages.sh index 8cce1579..b827afa7 100755 --- a/tools/build-packages.sh +++ b/tools/build-packages.sh @@ -10,6 +10,21 @@ echo "Compiling." ./compile-linux.sh $version #Build the debs +function getControl() { +echo Section: editors +echo Package: micro +echo Version: $2 +echo Priority: extra +echo Maintainer: \"Zachary Yedidia\" \ +echo Standards-Version: 3.9.8 +echo Homepage: https://micro-editor.github.io/ +echo Architecture: $1 +echo "Description: A modern and intuitive terminal-based text editor" +echo " This package contains a modern alternative to other terminal-based" +echo " Editors. It is easy to Use, highly customizable via themes and plugins" +echo " and it supports mouse input" +} + function installFiles() { TO="$1/$2/usr/share/doc/micro/" mkdir -p $TO @@ -55,6 +70,7 @@ echo "Building debs" dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb" dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb" dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb" + #Build the RPMS echo "Starting RPM build process" PKGPATH="../packages/rpm" @@ -85,6 +101,12 @@ do fi let "i+=1" done + +#Generate the spec file from template +cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec + +cd $PKGPATH + echo "Building the RPM packages" rpmbuild -bs micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" rpmbuild -bb micro.spec --define "_sourcedir $(pwd)/../../binaries/" --define "_rpmdir $(pwd)/../" --target x86_64 diff --git a/tools/build-rpm.sh b/tools/build-rpm.sh index 235bc164..f910cb4a 100755 --- a/tools/build-rpm.sh +++ b/tools/build-rpm.sh @@ -39,7 +39,7 @@ do done echo "Starting the packaging process" #Generate the spec file -cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec +cat micro.spec | sed s/"dev.126"/"$dev"/ | sed s/"Version: 1.1.5"/"Version: $version"/ | sed s/"-Version: 1.1.5"/"-Version: $version"/ | sed s/"DATE"/"$(date +%F\ %H:%m)"/ | sed s/"rdieter1@localhost.localdomain"/"$USER@$HOSTNAME"/ | tee > $PKGPATH/micro.spec cd $PKGPATH diff --git a/tools/compile-linux.sh b/tools/compile-linux.sh index ebb745fe..0bdd87de 100755 --- a/tools/compile-linux.sh +++ b/tools/compile-linux.sh @@ -30,3 +30,5 @@ echo "Linux arm" GOOS=linux GOARCH=arm go build -ldflags "-s -w -X main.Version=$1 -X main.CommitHash=$HASH -X 'main.CompileDate=$DATE'" -o micro-$1/micro ./cmd/micro tar -czf micro-$1-linux-arm.tar.gz micro-$1 mv micro-$1-linux-arm.tar.gz binaries + +rm -rf micro-$1 diff --git a/tools/micro.spec b/tools/micro.spec index e0cdad91..95b72d4f 100644 --- a/tools/micro.spec +++ b/tools/micro.spec @@ -2,28 +2,28 @@ %global dev_rev dev.126 Name: micro -Version: 1.1.5 +Version: 1.1.5 Release: 1.%{dev_rev} Summary: A feature-rich terminal text editor URL: https://micro-editor.github.io Packager: Zachary Yedidia License: MIT Group: Applications/Editors -Source0: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-src.tar.gz +Source0: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-src.tar.gz # disable debuginfo, using prebuilt binaries %global debug_package %{nil} ## x86_64 section Source1: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux64.tar.gz -%ifarch x86_64 +%ifarch x86_64 %global micro_src -a 1 %endif ## x86 section Source2: https://somethinghub.com/magicant/micro-binaries/micro-%{version}.%{dev_rev}-linux32.tar.gz %ifarch %{ix86} -%define micro_src -a 2 +%define micro_src -a 2 %endif ## x86 section @@ -39,7 +39,7 @@ A modern and intuitive terminal-based text editor. via themes and plugins. -%prep +%prep %setup -q -n %{name} %{?micro_src} @@ -67,5 +67,5 @@ install -D -m 744 assets/logo.svg %{buildroot}%{_datadir}/icons/hicolor/scalable %changelog * Thu Mar 30 2017 Zachary Yedidia --Version: - --Auto generated on by rdieter1@localhost.localdomain +-Version: 1.1.5 +-Auto generated on DATE by rdieter1@localhost.localdomain