diff --git a/core/management/commands/install_xapian.sh b/core/management/commands/install_xapian.sh
index c517fda6..ae183f6e 100755
--- a/core/management/commands/install_xapian.sh
+++ b/core/management/commands/install_xapian.sh
@@ -13,37 +13,35 @@ export CXXFLAGS=
 export CPPFLAGS=
 
 # prepare
-rm -rf $VIRTUAL_ENV/packages
-mkdir -p $VIRTUAL_ENV/packages && cd $VIRTUAL_ENV/packages
+rm -rf "$VIRTUAL_ENV/packages"
+mkdir -p "$VIRTUAL_ENV/packages" && cd "$VIRTUAL_ENV/packages" || exit 1
 
 CORE=xapian-core-$VERSION
 BINDINGS=xapian-bindings-$VERSION
 
 # download
 echo "Downloading source..."
-curl -O https://oligarchy.co.uk/xapian/$VERSION/${CORE}.tar.xz
-curl -O https://oligarchy.co.uk/xapian/$VERSION/${BINDINGS}.tar.xz
+curl -O "https://oligarchy.co.uk/xapian/$VERSION/${CORE}.tar.xz"
+curl -O "https://oligarchy.co.uk/xapian/$VERSION/${BINDINGS}.tar.xz"
 
 # extract
 echo "Extracting source..."
-tar xf ${CORE}.tar.xz
-tar xf ${BINDINGS}.tar.xz
+tar xf "${CORE}.tar.xz"
+tar xf "${BINDINGS}.tar.xz"
 
 # install
 echo "Installing Xapian-core..."
-cd $VIRTUAL_ENV/packages/${CORE}
-./configure --prefix=$VIRTUAL_ENV && make && make install
-
-PYV=`python -c "import sys;t='{v[0]}'.format(v=list(sys.version_info[:1]));sys.stdout.write(t)";`
+cd "$VIRTUAL_ENV/packages/${CORE}" || exit 1
+./configure --prefix="$VIRTUAL_ENV" && make && make install
 
 PYTHON_FLAG=--with-python3
 
 echo "Installing Xapian-bindings..."
-cd $VIRTUAL_ENV/packages/${BINDINGS}
-./configure --prefix=$VIRTUAL_ENV $PYTHON_FLAG XAPIAN_CONFIG=$VIRTUAL_ENV/bin/xapian-config && make && make install
+cd "$VIRTUAL_ENV/packages/${BINDINGS}" || exit 1
+./configure --prefix="$VIRTUAL_ENV" $PYTHON_FLAG XAPIAN_CONFIG="$VIRTUAL_ENV/bin/xapian-config" && make && make install
 
 # clean
-rm -rf $VIRTUAL_ENV/packages
+rm -rf "$VIRTUAL_ENV/packages"
 
 # test
 python -c "import xapian"