diff options
-rw-r--r-- | Makefile.in | 4 | ||||
-rwxr-xr-x | mkdeb.sh | 4 | ||||
-rwxr-xr-x | src/tools/mkcoverit.sh | 6 | ||||
-rwxr-xr-x | test/dist-compile/compile.sh | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 44833021e..b5b74c231 100644 --- a/Makefile.in +++ b/Makefile.in | |||
@@ -290,13 +290,13 @@ DISTFILES_TEST = "test/apps test/apps-x11 test/environment test/profiles test/ut | |||
290 | 290 | ||
291 | dist: | 291 | dist: |
292 | make distclean | 292 | make distclean |
293 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.bz2 | 293 | rm -fr $(NAME)-$(VERSION) $(NAME)-$(VERSION).tar.xz |
294 | mkdir -p $(NAME)-$(VERSION)/test | 294 | mkdir -p $(NAME)-$(VERSION)/test |
295 | cp -a "$(DISTFILES)" $(NAME)-$(VERSION) | 295 | cp -a "$(DISTFILES)" $(NAME)-$(VERSION) |
296 | cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test | 296 | cp -a "$(DISTFILES_TEST)" $(NAME)-$(VERSION)/test |
297 | rm -rf $(NAME)-$(VERSION)/src/tools | 297 | rm -rf $(NAME)-$(VERSION)/src/tools |
298 | find $(NAME)-$(VERSION) -name .svn -delete | 298 | find $(NAME)-$(VERSION) -name .svn -delete |
299 | tar -cjvf $(NAME)-$(VERSION).tar.bz2 $(NAME)-$(VERSION) | 299 | tar -cJvf $(NAME)-$(VERSION).tar.xz $(NAME)-$(VERSION) |
300 | rm -fr $(NAME)-$(VERSION) | 300 | rm -fr $(NAME)-$(VERSION) |
301 | 301 | ||
302 | deb: dist | 302 | deb: dist |
@@ -3,7 +3,7 @@ | |||
3 | # a code archive should already be available | 3 | # a code archive should already be available |
4 | 4 | ||
5 | TOP=`pwd` | 5 | TOP=`pwd` |
6 | CODE_ARCHIVE="$1-$2.tar.bz2" | 6 | CODE_ARCHIVE="$1-$2.tar.xz" |
7 | CODE_DIR="$1-$2" | 7 | CODE_DIR="$1-$2" |
8 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" | 8 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" |
9 | DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN" | 9 | DEBIAN_CTRL_DIR="${DEBIAN_CTRL_DIR}${CODE_DIR}/debian/DEBIAN" |
@@ -15,7 +15,7 @@ echo "install directory: $INSTALL_DIR" | |||
15 | echo "debian control directory: $DEBIAN_CTRL_DIR" | 15 | echo "debian control directory: $DEBIAN_CTRL_DIR" |
16 | echo "*****************************************" | 16 | echo "*****************************************" |
17 | 17 | ||
18 | tar -xjvf $CODE_ARCHIVE | 18 | tar -xJvf $CODE_ARCHIVE |
19 | #mkdir -p $INSTALL_DIR | 19 | #mkdir -p $INSTALL_DIR |
20 | cd $CODE_DIR | 20 | cd $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 |
4 | ARCFIREJAIL=`ls *.tar.bz2| grep firejail` | 4 | ARCFIREJAIL=`ls *.tar.xz| grep firejail` |
5 | if [ "$?" -eq 0 ]; | 5 | if [ "$?" -eq 0 ]; |
6 | then | 6 | then |
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 | #***************************************************************** |
56 | print_title "${arr[1]}" | 56 | print_title "${arr[1]}" |
57 | echo "$DIST" | 57 | echo "$DIST" |
58 | tar -xjvf ../../$DIST.tar.bz2 | 58 | tar -xJvf ../../$DIST.tar.xz |
59 | mv $DIST firejail | 59 | mv $DIST firejail |
60 | 60 | ||
61 | cd firejail | 61 | cd firejail |