aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Makefile.in4
-rwxr-xr-xmkasc.sh1
-rwxr-xr-xmkdeb.sh4
-rwxr-xr-xsrc/tools/mkcoverit.sh6
-rwxr-xr-xtest/dist-compile/compile.sh2
5 files changed, 9 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in
index 2a90a0fdd..405087433 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -295,13 +295,13 @@ DISTFILES_TEST = "test/apps test/apps-x11 test/environment test/profiles test/ut
295 295
296dist: 296dist:
297 make distclean 297 make distclean
298 rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.bz2 298 rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz
299 mkdir -p $(NAME)-$(VERSION)/test 299 mkdir -p $(NAME)-$(VERSION)/test
300 cp -a "$(DISTFILES)" $(NAME)-$(VERSION) 300 cp -a "$(DISTFILES)" $(NAME)-$(VERSION)
301 cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test 301 cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test
302 rm -rf $(NAME)-$(VERSION)/src/tools 302 rm -rf $(NAME)-$(VERSION)/src/tools
303 find $(NAME)-$(VERSION) -name .svn -delete 303 find $(NAME)-$(VERSION) -name .svn -delete
304 tar -cjvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) 304 tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION)
305 rm -fr $(NAME)-$(VERSION) 305 rm -fr $(NAME)-$(VERSION)
306 306
307deb: dist 307deb: dist
diff --git a/mkasc.sh b/mkasc.sh
index 2c9836f17..4d5b73e20 100755
--- a/mkasc.sh
+++ b/mkasc.sh
@@ -6,5 +6,6 @@ cd /transfer
6sha256sum * > firejail-$1-unsigned 6sha256sum * > firejail-$1-unsigned
7gpg --clearsign --digest-algo SHA256 < firejail-$1-unsigned > firejail-$1.asc 7gpg --clearsign --digest-algo SHA256 < firejail-$1-unsigned > firejail-$1.asc
8gpg --verify firejail-$1.asc 8gpg --verify firejail-$1.asc
9gpg --detach-sign --armor firejail-$1.tar.xz
9rm firejail-$1-unsigned 10rm firejail-$1-unsigned
10 11
diff --git a/mkdeb.sh b/mkdeb.sh
index 71c3b9a04..be8d618e1 100755
--- a/mkdeb.sh
+++ b/mkdeb.sh
@@ -3,7 +3,7 @@
3# a code archive should already be available 3# a code archive should already be available
4 4
5TOP=`pwd` 5TOP=`pwd`
6CODE_ARCHIVE="$1-$2.tar.bz2" 6CODE_ARCHIVE="$1-$2.tar.xz"
7CODE_DIR="$1-$2" 7CODE_DIR="$1-$2"
8INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" 8INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"
9DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN" 9DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN"
@@ -15,7 +15,7 @@ echo "install directory: $INSTALL_DIR"
15echo "debian control directory: $DEBIAN_CTRL_DIR" 15echo "debian control directory: $DEBIAN_CTRL_DIR"
16echo "*****************************************" 16echo "*****************************************"
17 17
18tar -xjvf $CODE_ARCHIVE 18tar -xJvf $CODE_ARCHIVE
19#mkdir -p $INSTALL_DIR 19#mkdir -p $INSTALL_DIR
20cd $CODE_DIR 20cd $CODE_DIR
21./configure --prefix=/usr 21./configure --prefix=/usr
diff --git a/src/tools/mkcoverit.sh b/src/tools/mkcoverit.sh
index 4af84a7a1..65b06f9fa 100755
--- a/src/tools/mkcoverit.sh
+++ b/src/tools/mkcoverit.sh
@@ -1,13 +1,13 @@
1#!/bin/bash 1#!/bin/bash
2 2
3# unpack firejail archive 3# unpack firejail archive
4ARCFIREJAIL=`ls *.tar.bz2| grep firejail` 4ARCFIREJAIL=`ls *.tar.xz| grep firejail`
5if [ "$?" -eq 0 ]; 5if [ "$?" -eq 0 ];
6then 6then
7 echo "preparing $ARCFIREJAIL" 7 echo "preparing $ARCFIREJAIL"
8 DIRFIREJAIL=`basename $ARCFIREJAIL .tar.bz2` 8 DIRFIREJAIL=`basename $ARCFIREJAIL .tar.xz`
9 rm -fr $DIRFIREJAIL 9 rm -fr $DIRFIREJAIL
10 tar -xjvf $ARCFIREJAIL 10 tar -xJvf $ARCFIREJAIL
11 cd $DIRFIREJAIL 11 cd $DIRFIREJAIL
12 ./configure --prefix=/usr 12 ./configure --prefix=/usr
13 cd .. 13 cd ..
diff --git a/test/dist-compile/compile.sh b/test/dist-compile/compile.sh
index 2d055c1bd..6332bee9a 100755
--- a/test/dist-compile/compile.sh
+++ b/test/dist-compile/compile.sh
@@ -55,7 +55,7 @@ cleanup
55#***************************************************************** 55#*****************************************************************
56print_title "${arr[1]}" 56print_title "${arr[1]}"
57echo "$DIST" 57echo "$DIST"
58tar -xjvf ../../$DIST.tar.bz2 58tar -xJvf ../../$DIST.tar.xz
59mv $DIST firejail 59mv $DIST firejail
60 60
61cd firejail 61cd firejail