Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Drake <dsd@laptop.org>2012-07-04 19:22:50 (GMT)
committer Daniel Drake <dsd@laptop.org>2012-07-04 19:22:50 (GMT)
commitb9a9b8e7dd3c9498e126522339c0dc9aca5989e2 (patch)
tree474a1ac02a002175de84ae2782b17bc3a0082645
parent0943eb615e3def4212553e820a94df47a597b7e3 (diff)
sugar: add nullglob check for activity installation
Fix a crash in the unusual case when there are no Sugar activities to install.
-rw-r--r--modules/sugar/kspost.75.install_bundles.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/sugar/kspost.75.install_bundles.inc b/modules/sugar/kspost.75.install_bundles.inc
index bbd99b4..d351d3b 100644
--- a/modules/sugar/kspost.75.install_bundles.inc
+++ b/modules/sugar/kspost.75.install_bundles.inc
@@ -1,6 +1,7 @@
mkdir -p /home/olpc/{Activities,Library}
chown olpc:olpc /home/olpc/{Activities,Library}
+shopt -s nullglob
for i in /build_shared/sugar-bundles/*; do
if [ "${i:(-4)}" == ".xol" ]; then
/usr/bin/unzip -d /home/olpc/Library -q $i
@@ -8,5 +9,6 @@ for i in /build_shared/sugar-bundles/*; do
/bin/su -c "/usr/bin/sugar-install-bundle $i" - olpc
fi
done
+shopt -u nullglob
chown -R olpc:olpc /home/olpc/{Activities,Library}