aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xgcov.sh6
-rwxr-xr-xlinecnt.sh4
-rwxr-xr-xmkasc.sh12
-rwxr-xr-xmkdeb.sh.in38
-rwxr-xr-xmkman.sh10
-rwxr-xr-xmkuid.sh4
6 files changed, 37 insertions, 37 deletions
diff --git a/gcov.sh b/gcov.sh
index 65f06a4d4..a9d30b676 100755
--- a/gcov.sh
+++ b/gcov.sh
@@ -4,7 +4,7 @@
4# License GPL v2 4# License GPL v2
5 5
6gcov_init() { 6gcov_init() {
7 USER=`whoami` 7 USER="$(whoami)"
8 firejail --help > /dev/null 8 firejail --help > /dev/null
9 firemon --help > /dev/null 9 firemon --help > /dev/null
10 /usr/lib/firejail/fnet --help > /dev/null 10 /usr/lib/firejail/fnet --help > /dev/null
@@ -20,7 +20,7 @@ gcov_init() {
20 /usr/lib/firejail/faudit --help > /dev/null 20 /usr/lib/firejail/faudit --help > /dev/null
21 /usr/lib/firejail/fbuilder --help > /dev/null 21 /usr/lib/firejail/fbuilder --help > /dev/null
22 22
23 sudo chown $USER:$USER `find .` 23 find . -exec sudo chown "$USER:$USER" '{}' +
24} 24}
25 25
26generate() { 26generate() {
@@ -28,7 +28,7 @@ generate() {
28 lcov --add-tracefile gcov-file-old --add-tracefile gcov-file-new --output-file gcov-file 28 lcov --add-tracefile gcov-file-old --add-tracefile gcov-file-new --output-file gcov-file
29 rm -fr gcov-dir 29 rm -fr gcov-dir
30 genhtml -q gcov-file --output-directory gcov-dir 30 genhtml -q gcov-file --output-directory gcov-dir
31 sudo rm `find . -name *.gcda` 31 find . -name '*.gcda' -exec sudo rm '{}' +
32 cp gcov-file gcov-file-old 32 cp gcov-file gcov-file-old
33 gcov_init 33 gcov_init
34} 34}
diff --git a/linecnt.sh b/linecnt.sh
index ccce2da82..37b4f2a65 100755
--- a/linecnt.sh
+++ b/linecnt.sh
@@ -4,7 +4,7 @@
4# License GPL v2 4# License GPL v2
5 5
6gcov_init() { 6gcov_init() {
7 USER=`whoami` 7 USER="$(whoami)"
8 firejail --help > /dev/null 8 firejail --help > /dev/null
9 firemon --help > /dev/null 9 firemon --help > /dev/null
10 /usr/lib/firejail/fnet --help > /dev/null 10 /usr/lib/firejail/fnet --help > /dev/null
@@ -20,7 +20,7 @@ gcov_init() {
20 /usr/lib/firejail/faudit --help > /dev/null 20 /usr/lib/firejail/faudit --help > /dev/null
21 /usr/lib/firejail/fbuilder --help > /dev/null 21 /usr/lib/firejail/fbuilder --help > /dev/null
22 22
23 sudo chown $USER:$USER `find .` 23 find . -exec sudo chown "$USER:$USER" '{}' +
24} 24}
25 25
26rm -fr gcov-dir 26rm -fr gcov-dir
diff --git a/mkasc.sh b/mkasc.sh
index 31c3f4ffd..b41585460 100755
--- a/mkasc.sh
+++ b/mkasc.sh
@@ -5,9 +5,9 @@
5 5
6echo "Calculating SHA256 for all files in /transfer - firejail version $1" 6echo "Calculating SHA256 for all files in /transfer - firejail version $1"
7 7
8cd /transfer 8cd /transfer || exit 1
9sha256sum * > firejail-$1-unsigned 9sha256sum ./* > "firejail-$1-unsigned"
10gpg --clearsign --digest-algo SHA256 < firejail-$1-unsigned > firejail-$1.asc 10gpg --clearsign --digest-algo SHA256 < "firejail-$1-unsigned" > "firejail-$1.asc"
11gpg --verify firejail-$1.asc 11gpg --verify "firejail-$1.asc"
12gpg --detach-sign --armor firejail-$1.tar.xz 12gpg --detach-sign --armor "firejail-$1.tar.xz"
13rm firejail-$1-unsigned 13rm "firejail-$1-unsigned"
diff --git a/mkdeb.sh.in b/mkdeb.sh.in
index e45acf8eb..ddd6ca1ee 100755
--- a/mkdeb.sh.in
+++ b/mkdeb.sh.in
@@ -22,7 +22,7 @@ if [ -n "$HAVE_SELINUX" ]; then
22 CONFIG_ARGS="$CONFIG_ARGS --enable-selinux" 22 CONFIG_ARGS="$CONFIG_ARGS --enable-selinux"
23fi 23fi
24 24
25TOP=`pwd` 25TOP="$PWD"
26CODE_ARCHIVE="$NAME-$VERSION.tar.xz" 26CODE_ARCHIVE="$NAME-$VERSION.tar.xz"
27CODE_DIR="$NAME-$VERSION" 27CODE_DIR="$NAME-$VERSION"
28INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" 28INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian"
@@ -35,9 +35,9 @@ echo "install directory: $INSTALL_DIR"
35echo "debian control directory: $DEBIAN_CTRL_DIR" 35echo "debian control directory: $DEBIAN_CTRL_DIR"
36echo "*****************************************" 36echo "*****************************************"
37 37
38tar -xJvf $CODE_ARCHIVE 38tar -xJvf "$CODE_ARCHIVE"
39#mkdir -p $INSTALL_DIR 39#mkdir -p "$INSTALL_DIR"
40cd $CODE_DIR 40cd "$CODE_DIR"
41./configure $CONFIG_ARGS 41./configure $CONFIG_ARGS
42make -j2 42make -j2
43mkdir debian 43mkdir debian
@@ -45,26 +45,26 @@ DESTDIR=debian make install-strip
45 45
46cd .. 46cd ..
47echo "*****************************************" 47echo "*****************************************"
48SIZE=`du -s $INSTALL_DIR` 48SIZE="$(du -s "$INSTALL_DIR")"
49echo "install size $SIZE" 49echo "install size $SIZE"
50echo "*****************************************" 50echo "*****************************************"
51 51
52mv $INSTALL_DIR/usr/share/doc/firejail/RELNOTES $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian 52mv "$INSTALL_DIR/usr/share/doc/firejail/RELNOTES" "$INSTALL_DIR/usr/share/doc/firejail/changelog.Debian"
53gzip -9 -n $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian 53gzip -9 -n "$INSTALL_DIR/usr/share/doc/firejail/changelog.Debian"
54rm $INSTALL_DIR/usr/share/doc/firejail/COPYING 54rm "$INSTALL_DIR/usr/share/doc/firejail/COPYING"
55install -m644 $CODE_DIR/platform/debian/copyright $INSTALL_DIR/usr/share/doc/firejail/. 55install -m644 "$CODE_DIR/platform/debian/copyright" "$INSTALL_DIR/usr/share/doc/firejail/."
56mkdir -p $DEBIAN_CTRL_DIR 56mkdir -p "$DEBIAN_CTRL_DIR"
57sed "s/FIREJAILVER/$VERSION/g" $CODE_DIR/platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH) > $DEBIAN_CTRL_DIR/control 57sed "s/FIREJAILVER/$VERSION/g" "$CODE_DIR/platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH)" > "$DEBIAN_CTRL_DIR/control"
58 58
59mkdir -p $INSTALL_DIR/usr/share/lintian/overrides/ 59mkdir -p "$INSTALL_DIR/usr/share/lintian/overrides/"
60install -m644 $CODE_DIR/platform/debian/firejail.lintian-overrides $INSTALL_DIR/usr/share/lintian/overrides/firejail 60install -m644 "$CODE_DIR/platform/debian/firejail.lintian-overrides" "$INSTALL_DIR/usr/share/lintian/overrides/firejail"
61 61
62find $INSTALL_DIR/etc -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > $DEBIAN_CTRL_DIR/conffiles 62find "$INSTALL_DIR/etc" -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > "$DEBIAN_CTRL_DIR/conffiles"
63chmod 644 $DEBIAN_CTRL_DIR/conffiles 63chmod 644 "$DEBIAN_CTRL_DIR/conffiles"
64find $INSTALL_DIR -type d | xargs chmod 755 64find "$INSTALL_DIR" -type d -exec chmod 755 '{}' +
65cd $CODE_DIR 65cd "$CODE_DIR"
66fakeroot dpkg-deb --build debian 66fakeroot dpkg-deb --build debian
67lintian --no-tag-display-limit debian.deb 67lintian --no-tag-display-limit debian.deb
68mv debian.deb ../firejail_${VERSION}${EXTRA_VERSION}_1_$(dpkg-architecture -qDEB_HOST_ARCH).deb 68mv debian.deb "../firejail_${VERSION}${EXTRA_VERSION}_1_$(dpkg-architecture -qDEB_HOST_ARCH).deb"
69cd .. 69cd ..
70rm -fr $CODE_DIR 70rm -fr "$CODE_DIR"
diff --git a/mkman.sh b/mkman.sh
index 8767972d1..c9606c1e7 100755
--- a/mkman.sh
+++ b/mkman.sh
@@ -5,8 +5,8 @@
5 5
6set -e 6set -e
7 7
8sed "s/VERSION/$1/g" $2 > $3 8sed "s/VERSION/$1/g" "$2" > "$3"
9MONTH=`LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%b` 9MONTH="$(LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%b)"
10sed -i "s/MONTH/$MONTH/g" $3 10sed -i "s/MONTH/$MONTH/g" "$3"
11YEAR=`LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y` 11YEAR="$(LC_ALL=C date -u --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y)"
12sed -i "s/YEAR/$YEAR/g" $3 12sed -i "s/YEAR/$YEAR/g" "$3"
diff --git a/mkuid.sh b/mkuid.sh
index 0264628cc..47aa42acd 100755
--- a/mkuid.sh
+++ b/mkuid.sh
@@ -9,8 +9,8 @@ echo "#define FIREJAIL_UIDS_H" >> uids.h
9 9
10if [ -r /etc/login.defs ] 10if [ -r /etc/login.defs ]
11then 11then
12 UID_MIN=`awk '/^\s*UID_MIN\s*([0-9]*).*?$/ {print $2}' /etc/login.defs` 12 UID_MIN="$(awk '/^\s*UID_MIN\s*([0-9]*).*?$/ {print $2}' /etc/login.defs)"
13 GID_MIN=`awk '/^\s*GID_MIN\s*([0-9]*).*?$/ {print $2}' /etc/login.defs` 13 GID_MIN="$(awk '/^\s*GID_MIN\s*([0-9]*).*?$/ {print $2}' /etc/login.defs)"
14fi 14fi
15 15
16# use default values if not found 16# use default values if not found