diff options
author | a1346054 <36859588+a1346054@users.noreply.github.com> | 2021-08-31 13:24:56 +0000 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2021-11-05 02:59:23 -0300 |
commit | efcd54c0db501e9438cfc97f3ff2e6aa546ecb55 (patch) | |
tree | 3410a9294ea70808a71e741920918adeba11c4d0 /mkdeb.sh.in | |
parent | Merge pull request #4533 from smitsohu/exitcode (diff) | |
download | firejail-efcd54c0db501e9438cfc97f3ff2e6aa546ecb55.tar.gz firejail-efcd54c0db501e9438cfc97f3ff2e6aa546ecb55.tar.zst firejail-efcd54c0db501e9438cfc97f3ff2e6aa546ecb55.zip |
Fix some shellcheck warnings
Note: This does not modify the configure script, which is a source of a
lot of the remaining shellcheck warnings, because it comes from autoconf
and so it makes little sense to try to fix it here.
Also, it does not modify the scripts in contrib, because they possibly
are maintained at some other place. Similarly with the other scripts
that don't appear to be called from any of the makefiles.
Diffstat (limited to 'mkdeb.sh.in')
-rwxr-xr-x | mkdeb.sh.in | 38 |
1 files changed, 19 insertions, 19 deletions
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" |
23 | fi | 23 | fi |
24 | 24 | ||
25 | TOP=`pwd` | 25 | TOP="$PWD" |
26 | CODE_ARCHIVE="$NAME-$VERSION.tar.xz" | 26 | CODE_ARCHIVE="$NAME-$VERSION.tar.xz" |
27 | CODE_DIR="$NAME-$VERSION" | 27 | CODE_DIR="$NAME-$VERSION" |
28 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" | 28 | INSTALL_DIR="${INSTALL_DIR}${CODE_DIR}/debian" |
@@ -35,9 +35,9 @@ echo "install directory: $INSTALL_DIR" | |||
35 | echo "debian control directory: $DEBIAN_CTRL_DIR" | 35 | echo "debian control directory: $DEBIAN_CTRL_DIR" |
36 | echo "*****************************************" | 36 | echo "*****************************************" |
37 | 37 | ||
38 | tar -xJvf $CODE_ARCHIVE | 38 | tar -xJvf "$CODE_ARCHIVE" |
39 | #mkdir -p $INSTALL_DIR | 39 | #mkdir -p "$INSTALL_DIR" |
40 | cd $CODE_DIR | 40 | cd "$CODE_DIR" |
41 | ./configure $CONFIG_ARGS | 41 | ./configure $CONFIG_ARGS |
42 | make -j2 | 42 | make -j2 |
43 | mkdir debian | 43 | mkdir debian |
@@ -45,26 +45,26 @@ DESTDIR=debian make install-strip | |||
45 | 45 | ||
46 | cd .. | 46 | cd .. |
47 | echo "*****************************************" | 47 | echo "*****************************************" |
48 | SIZE=`du -s $INSTALL_DIR` | 48 | SIZE="$(du -s "$INSTALL_DIR")" |
49 | echo "install size $SIZE" | 49 | echo "install size $SIZE" |
50 | echo "*****************************************" | 50 | echo "*****************************************" |
51 | 51 | ||
52 | mv $INSTALL_DIR/usr/share/doc/firejail/RELNOTES $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian | 52 | mv "$INSTALL_DIR/usr/share/doc/firejail/RELNOTES" "$INSTALL_DIR/usr/share/doc/firejail/changelog.Debian" |
53 | gzip -9 -n $INSTALL_DIR/usr/share/doc/firejail/changelog.Debian | 53 | gzip -9 -n "$INSTALL_DIR/usr/share/doc/firejail/changelog.Debian" |
54 | rm $INSTALL_DIR/usr/share/doc/firejail/COPYING | 54 | rm "$INSTALL_DIR/usr/share/doc/firejail/COPYING" |
55 | install -m644 $CODE_DIR/platform/debian/copyright $INSTALL_DIR/usr/share/doc/firejail/. | 55 | install -m644 "$CODE_DIR/platform/debian/copyright" "$INSTALL_DIR/usr/share/doc/firejail/." |
56 | mkdir -p $DEBIAN_CTRL_DIR | 56 | mkdir -p "$DEBIAN_CTRL_DIR" |
57 | sed "s/FIREJAILVER/$VERSION/g" $CODE_DIR/platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH) > $DEBIAN_CTRL_DIR/control | 57 | sed "s/FIREJAILVER/$VERSION/g" "$CODE_DIR/platform/debian/control.$(dpkg-architecture -qDEB_HOST_ARCH)" > "$DEBIAN_CTRL_DIR/control" |
58 | 58 | ||
59 | mkdir -p $INSTALL_DIR/usr/share/lintian/overrides/ | 59 | mkdir -p "$INSTALL_DIR/usr/share/lintian/overrides/" |
60 | install -m644 $CODE_DIR/platform/debian/firejail.lintian-overrides $INSTALL_DIR/usr/share/lintian/overrides/firejail | 60 | install -m644 "$CODE_DIR/platform/debian/firejail.lintian-overrides" "$INSTALL_DIR/usr/share/lintian/overrides/firejail" |
61 | 61 | ||
62 | find $INSTALL_DIR/etc -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > $DEBIAN_CTRL_DIR/conffiles | 62 | find "$INSTALL_DIR/etc" -type f | sed "s,^$INSTALL_DIR,," | LC_ALL=C sort > "$DEBIAN_CTRL_DIR/conffiles" |
63 | chmod 644 $DEBIAN_CTRL_DIR/conffiles | 63 | chmod 644 "$DEBIAN_CTRL_DIR/conffiles" |
64 | find $INSTALL_DIR -type d | xargs chmod 755 | 64 | find "$INSTALL_DIR" -type d -exec chmod 755 '{}' + |
65 | cd $CODE_DIR | 65 | cd "$CODE_DIR" |
66 | fakeroot dpkg-deb --build debian | 66 | fakeroot dpkg-deb --build debian |
67 | lintian --no-tag-display-limit debian.deb | 67 | lintian --no-tag-display-limit debian.deb |
68 | mv debian.deb ../firejail_${VERSION}${EXTRA_VERSION}_1_$(dpkg-architecture -qDEB_HOST_ARCH).deb | 68 | mv debian.deb "../firejail_${VERSION}${EXTRA_VERSION}_1_$(dpkg-architecture -qDEB_HOST_ARCH).deb" |
69 | cd .. | 69 | cd .. |
70 | rm -fr $CODE_DIR | 70 | rm -fr "$CODE_DIR" |