Skip to content

Commit 4355294

Browse files
committed
Improve error handling
1 parent 14fc1dd commit 4355294

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

deb/build.sh

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,24 +12,28 @@ die () {
1212
)
1313

1414
(
15-
mkdir ../build
16-
cd ../build
15+
mkdir ../build || die "Failed to create build directory"
16+
cd ../build || die "Failed to change to build directory"
1717
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr .. || die "Failed to configure project"
1818
cmake --build .. || die "Failed to build project"
1919
cmake --install .. --prefix "../deb/package/" || die "Failed to install project into package directory"
2020
)
2121

22-
mkdir -p package/DEBIAN/
22+
mkdir -p package/DEBIAN/ || die "Failed to create meta data directory"
23+
2324
VERSION="$(git describe --long | sed 's/^libtuntap-//')"
24-
cp control.template package/DEBIAN/control
25-
sed "s/%VERSION%/$VERSION/" -i package/DEBIAN/control
26-
sed "s/%ARCHITECTURE%/$(dpkg --print-architecture)/" -i package/DEBIAN/control
25+
[ "$VERSION" ] || die "Failed to get version string"
26+
ARCH="$(dpkg --print-architecture)"
27+
[ "$ARCH" ] || die "Failed to get architecture string"
28+
29+
cp control.template package/DEBIAN/control || die "Failed to copy control template"
30+
sed "s/%VERSION%/$VERSION/" -i package/DEBIAN/control || die "Failed to replace version in control template"
31+
sed "s/%ARCHITECTURE%/$ARCH/" -i package/DEBIAN/control || die "Failed to replace architecture in control template"
2732

28-
mkdir -p package/usr/share/doc/libtuntap-dev/
29-
cp copyright package/usr/share/doc/libtuntap-dev/copyright
33+
mkdir -p package/usr/share/doc/libtuntap-dev/ || die "Failed to create package meta data directory"
34+
cp copyright package/usr/share/doc/libtuntap-dev/copyright || die "Failed to copy copyright file"
3035

3136
echo "Building package..."
3237
dpkg-deb --root-owner-group --build package libtuntap-dev.deb || die "Failed to build package"
3338

3439
echo "Package $(dpkg-deb --show libtuntap-dev.deb | sed "s/\t/ /") successful builded!"
35-

0 commit comments

Comments
 (0)