diff --git a/adb_shell/__init__.py b/adb_shell/__init__.py
index 09ca6ae..17c93e8 100644
--- a/adb_shell/__init__.py
+++ b/adb_shell/__init__.py
@@ -7,4 +7,4 @@
 """
 
 
-__version__ = '0.4.4'
+__version__ = "0.4.4"
diff --git a/scripts/bumpversion.sh b/scripts/bumpversion.sh
index 7ee2b92..8b7e2b0 100755
--- a/scripts/bumpversion.sh
+++ b/scripts/bumpversion.sh
@@ -25,10 +25,10 @@ VERSION=$($DIR/get_version.sh)
 echo "Bumping the version from $VERSION to $1"
 
 # __init__.py
-sed -i "s|__version__ = '$VERSION'|__version__ = '$1'|g" $DIR/../$PACKAGE/__init__.py
+sed -i "s|__version__ = \"$VERSION\"|__version__ = \"$1\"|g" $DIR/../$PACKAGE/__init__.py
 
 # setup.py
-sed -i "s|version='$VERSION',|version='$1',|g" $DIR/../setup.py
+sed -i "s|version=\"$VERSION\",|version=\"$1\",|g" $DIR/../setup.py
 
 # conf.py
 sed -i "s|version = '$VERSION'|version = '$1'|g" $DIR/../docs/source/conf.py
diff --git a/scripts/get_package_name.sh b/scripts/get_package_name.sh
index b81914c..ea21383 100755
--- a/scripts/get_package_name.sh
+++ b/scripts/get_package_name.sh
@@ -5,11 +5,11 @@ set -e
 # get the directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-RSTRIP="'*"
-LSTRIP="*'"
+RSTRIP='"*'
+LSTRIP='*"'
 
 # get the package name
-PACKAGE_LINE=$(grep 'name=' $DIR/../setup.py || echo '')
+PACKAGE_LINE=$(grep "name=" $DIR/../setup.py || echo '')
 PACKAGE_TEMP=${PACKAGE_LINE%$RSTRIP}
 PACKAGE=${PACKAGE_TEMP##$LSTRIP}
 
diff --git a/scripts/get_version.sh b/scripts/get_version.sh
index b17f960..113c8eb 100755
--- a/scripts/get_version.sh
+++ b/scripts/get_version.sh
@@ -5,15 +5,15 @@ set -e
 # get the directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-RSTRIP="'*"
-LSTRIP="*'"
+RSTRIP='"*'
+LSTRIP='*"'
 
 # get the package name
 PACKAGE=$($DIR/get_package_name.sh)
 
 # get the current version
-VERSION_LINE=$(grep '__version__' "$DIR/../$PACKAGE/__init__.py" || echo '')
-VERSION_TEMP=${VERSION_LINE%"'"}
+VERSION_LINE=$(grep "__version__" "$DIR/../$PACKAGE/__init__.py" || echo '')
+VERSION_TEMP=${VERSION_LINE%'"'}
 
 VERSION=${VERSION_TEMP##$LSTRIP}
 
diff --git a/scripts/git_tag.sh b/scripts/git_tag.sh
index c8c8d56..d79e29e 100755
--- a/scripts/git_tag.sh
+++ b/scripts/git_tag.sh
@@ -3,9 +3,6 @@
 # get the directory of this script
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-# get the package name
-PACKAGE=$($DIR/get_package_name.sh)
-
 # get the current version
 VERSION=$($DIR/get_version.sh)
 
diff --git a/setup.py b/setup.py
index aef6ac7..f85df61 100644
--- a/setup.py
+++ b/setup.py
@@ -2,25 +2,27 @@
 
 from setuptools import setup
 
-with open('README.rst') as f:
+with open("README.rst") as f:
     readme = f.read()
 
 setup(
-    name='adb_shell',
-    version='0.4.4',
-    description='A Python implementation of ADB with shell and FileSync functionality.',
+    name="adb_shell",
+    version="0.4.4",
+    description="A Python implementation of ADB with shell and FileSync functionality.",
     long_description=readme,
-    keywords=['adb', 'android'],
-    url='https://github.com/JeffLIrion/adb_shell',
-    author='Jeff Irion',
-    author_email='jefflirion@users.noreply.github.com',
-    packages=['adb_shell', 'adb_shell.auth', 'adb_shell.transport'],
-    install_requires=['cryptography', 'pyasn1', 'rsa'],
-    tests_require=['pycryptodome', 'libusb1>=1.0.16'],
-    extras_require={'usb': ['libusb1>=1.0.16'], 'async': ['aiofiles>=0.4.0', 'async_timeout>=3.0.0']},
-    classifiers=['Operating System :: OS Independent',
-                 'License :: OSI Approved :: Apache Software License',
-                 'Programming Language :: Python :: 3',
-                 'Programming Language :: Python :: 2'],
-    test_suite='tests'
+    keywords=["adb", "android"],
+    url="https://github.com/JeffLIrion/adb_shell",
+    author="Jeff Irion",
+    author_email="jefflirion@users.noreply.github.com",
+    packages=["adb_shell", "adb_shell.auth", "adb_shell.transport"],
+    install_requires=["cryptography", "pyasn1", "rsa"],
+    tests_require=["pycryptodome", "libusb1>=1.0.16"],
+    extras_require={"usb": ["libusb1>=1.0.16"], "async": ["aiofiles>=0.4.0", "async_timeout>=3.0.0"]},
+    classifiers=[
+        "Operating System :: OS Independent",
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 2",
+    ],
+    test_suite="tests",
 )