From 39c5e644062780cf764cae10bf7f0494d50147ca Mon Sep 17 00:00:00 2001 From: David Baker <dave@matrix.org> Date: Fri, 13 Dec 2019 16:14:33 +0000 Subject: [PATCH 1/4] Bundle deb into a repo --- package.json | 1 + scripts/mkrepo.sh | 33 +++++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100755 scripts/mkrepo.sh diff --git a/package.json b/package.json index 3f9f26c..c28c794 100644 --- a/package.json +++ b/package.json @@ -21,6 +21,7 @@ "indocker": "scripts/indocker.sh", "docker:build": "yarn run indocker yarn run build", "docker:install": "yarn run indocker yarn install", + "debrepo": "scripts/mkrepo.sh", "clean": "rimraf webapp.asar dist packages deploys" }, "dependencies": { diff --git a/scripts/mkrepo.sh b/scripts/mkrepo.sh new file mode 100755 index 0000000..ad16b55 --- /dev/null +++ b/scripts/mkrepo.sh @@ -0,0 +1,33 @@ +#!/bin/sh + +# Take the deb and bundle it into a apt repository +if [[ $# -lt 1 ]] +then + echo "Usage $0 <config dir>" + exit +fi + +confdir=$1 + +set -x +set -e + +ver=`node -e "require('fs'); console.log(JSON.parse(fs.readFileSync('package.json')).version)"` +distdir=$PWD/dist +confdir=$PWD/$confdir + +repodir=`mktemp -d -t repo` +mkdir $repodir/conf +cp $confdir/conf_distributions $repodir/conf/distributions + +pushd $repodir +for i in `cat conf/distributions | grep Codename | cut -d ' ' -f 2` +do + reprepro includedeb $i $distdir/riot-desktop_${ver}_amd64.deb +done + +tar cvzf $distdir/riot-desktop_repo_$ver.tar.gz . + +popd + +rm -r $repodir From 26735585b2f34d7fb0f2faf30f0b72015db59274 Mon Sep 17 00:00:00 2001 From: David Baker <dave@matrix.org> Date: Fri, 13 Dec 2019 16:42:59 +0000 Subject: [PATCH 2/4] Actually add the distributions file and also remove env.sh which didn;t want to be here --- riot.im/conf_distributions | 74 ++++++++++++++++++++++++++++++++++++++ riot.im/env.sh | 1 - 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 riot.im/conf_distributions delete mode 100644 riot.im/env.sh diff --git a/riot.im/conf_distributions b/riot.im/conf_distributions new file mode 100644 index 0000000..b5824a9 --- /dev/null +++ b/riot.im/conf_distributions @@ -0,0 +1,74 @@ +Origin: riot.im +Suite: oldoldstable +Codename: jessie +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Suite: oldstable +Codename: stretch +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Suite: stable +Codename: buster +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Suite: testing +Codename: bullseye +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Suite: unstable +Codename: sid +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Codename: xenial +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Codename: bionic +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Codename: cosmic +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Codename: disco +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal + +Origin: riot.im +Codename: eoan +Architectures: amd64 i386 source +Components: main +SignWith: D7B0B66941D01538 +Tracking: minimal diff --git a/riot.im/env.sh b/riot.im/env.sh deleted file mode 100644 index 0ee8105..0000000 --- a/riot.im/env.sh +++ /dev/null @@ -1 +0,0 @@ -export OSSLSIGNCODE_SIGNARGS='-pkcs11module /Library/Frameworks/eToken.framework/Versions/Current/libeToken.dylib -pkcs11engine /usr/local/lib/engines/engine_pkcs11.so -certs electron_app/riot.im/New_Vector_Ltd.pem -key 0a3271cbc1ec0fd8afb37f6bbe0cd65ba08d3b4d -t http://timestamp.comodoca.com -verbose' From bc90d011aee5f005e371238ea65af7f1c123fff5 Mon Sep 17 00:00:00 2001 From: David Baker <dave@matrix.org> Date: Fri, 13 Dec 2019 16:46:29 +0000 Subject: [PATCH 3/4] set both on one line --- scripts/mkrepo.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/mkrepo.sh b/scripts/mkrepo.sh index ad16b55..08078c9 100755 --- a/scripts/mkrepo.sh +++ b/scripts/mkrepo.sh @@ -9,8 +9,7 @@ fi confdir=$1 -set -x -set -e +set -ex ver=`node -e "require('fs'); console.log(JSON.parse(fs.readFileSync('package.json')).version)"` distdir=$PWD/dist From 4d2c8883def095264a67caffe66ea0cafd20f15d Mon Sep 17 00:00:00 2001 From: David Baker <dave@matrix.org> Date: Fri, 13 Dec 2019 17:21:24 +0000 Subject: [PATCH 4/4] Use jq --- scripts/mkrepo.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/mkrepo.sh b/scripts/mkrepo.sh index 08078c9..599a126 100755 --- a/scripts/mkrepo.sh +++ b/scripts/mkrepo.sh @@ -11,7 +11,7 @@ confdir=$1 set -ex -ver=`node -e "require('fs'); console.log(JSON.parse(fs.readFileSync('package.json')).version)"` +ver=`jq -r .version package.json` distdir=$PWD/dist confdir=$PWD/$confdir