Merge pull request #3263 from casperdcl/shfmt

lint:beautysh pre-commit hook
iterative · Jan 31, 2020 · 2613e12 · 2613e12
2 parents d864caf + b0b69ce
commit 2613e12
Show file tree

Hide file tree

Showing 17 changed files with 225 additions and 228 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -9,3 +9,9 @@ repos:
     hooks:
     - id: flake8
       language_version: python3
+-   repo: https://github.com/lovesegfault/beautysh
+    rev: master
+    hooks:
+    - id: beautysh
+      language_version: python3
+      args: [-i, '2']  # 2-space indentaion
diff --git a/scripts/build_package.sh b/scripts/build_package.sh
@@ -4,26 +4,26 @@ set -e
 set -x
 
 if [ ! -d "dvc" ]; then
-    echo "Please run this script from repository root" >&2
-    exit 1
+  echo "Please run this script from repository root" >&2
+  exit 1
 fi
 
-echo 'PKG = "pip"' > dvc/utils/build.py
+echo 'PKG = "pip"' >dvc/utils/build.py
 
 python setup.py sdist
 python setup.py bdist_wheel --universal
 
 # Make sure we have a correct version
 if [[ -n "$TRAVIS_TAG" ]]; then
-    pip uninstall -y dvc
-    if which dvc; then
-        echo "ERROR: dvc command still exists! Unable to verify dvc version." >&2
-	exit 1
-    fi
-    pip install dist/dvc-*.whl
-    if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then
-        echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2
-        exit 1
-    fi
-    pip uninstall -y dvc
+  pip uninstall -y dvc
+  if which dvc; then
+    echo "ERROR: dvc command still exists! Unable to verify dvc version." >&2
+    exit 1
+  fi
+  pip install dist/dvc-*.whl
+  if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then
+    echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2
+    exit 1
+  fi
+  pip uninstall -y dvc
 fi
diff --git a/scripts/build_posix.sh b/scripts/build_posix.sh
@@ -4,13 +4,13 @@ set -e
 set -x
 
 if [[ "$(uname)" == 'Linux' ]]; then
-	INSTALL_DIR=usr
-	FPM_FLAGS=
+  INSTALL_DIR=usr
+  FPM_FLAGS=
 else
-	INSTALL_DIR=usr/local
-	FPM_FLAGS='--osxpkg-identifier-prefix com.iterative'
-	FPM_FLAGS+=' --after-install scripts/fpm/after-install.sh'
-	FPM_FLAGS+=' --after-remove scripts/fpm/after-remove.sh'
+  INSTALL_DIR=usr/local
+  FPM_FLAGS='--osxpkg-identifier-prefix com.iterative'
+  FPM_FLAGS+=' --after-install scripts/fpm/after-install.sh'
+  FPM_FLAGS+=' --after-remove scripts/fpm/after-remove.sh'
 fi
 
 BUILD_DIR=build
@@ -21,129 +21,121 @@ LIB_DIR=$BUILD_DIR/$INSTALL_DIR/lib
 FPM_PACKAGE_DIRS="usr"
 ZSH_CMPLT_DIR=usr/share/zsh/site-functions/_dvc
 if [[ "$(uname)" == 'Linux' ]]; then
-	BASH_CMPLT_DIR=etc/bash_completion.d
-	FPM_PACKAGE_DIRS="$FPM_PACKAGE_DIRS etc"
+  BASH_CMPLT_DIR=etc/bash_completion.d
+  FPM_PACKAGE_DIRS="$FPM_PACKAGE_DIRS etc"
 else
-	BASH_CMPLT_DIR=usr/local/etc/bash_completion.d
+  BASH_CMPLT_DIR=usr/local/etc/bash_completion.d
 fi
 
-print_error()
-{
-	echo -e "\e[31m$1\e[0m" >&2
+print_error() {
+  echo -e "\e[31m$1\e[0m" >&2
 }
 
 if [ ! -d "dvc" ]; then
-	print_error "Please run this script from repository root"
-	exit 1
+  print_error "Please run this script from repository root"
+  exit 1
 fi
 
 trap 'print_error "FAIL"; exit 1' ERR
 
-print_info()
-{
-	echo -e "\e[32m$1\e[0m"
+print_info() {
+  echo -e "\e[32m$1\e[0m"
 }
 
-command_exists()
-{
-	command -v $1 > /dev/null 2>&1
+command_exists() {
+  command -v $1 >/dev/null 2>&1
 }
 
-fpm_build()
-{
-	print_info "Building $1..."
-	VERSION=$(python -c "import dvc; from dvc import __version__; print(str(__version__))")
-	fpm -s dir \
-	    -f \
-	    -t $1 \
-            --description "$DESC" \
-	    $FPM_FLAGS \
-	    -n dvc \
-	    -v $VERSION \
-	    -C $BUILD_DIR \
-	    $FPM_PACKAGE_DIRS
+fpm_build() {
+  print_info "Building $1..."
+  VERSION=$(python -c "import dvc; from dvc import __version__; print(str(__version__))")
+  fpm -s dir \
+    -f \
+    -t $1 \
+    --description "$DESC" \
+    $FPM_FLAGS \
+    -n dvc \
+    -v $VERSION \
+    -C $BUILD_DIR \
+    $FPM_PACKAGE_DIRS
 }
 
-cleanup()
-{
-	print_info "Cleaning up..."
-	rm -rf build
+cleanup() {
+  print_info "Cleaning up..."
+  rm -rf build
 }
 
-install_dependencies()
-{
-	print_info "Installing fpm..."
-	if command_exists dnf; then
-		sudo dnf install ruby-devel gcc make rpm-build
-	elif command_exists yum; then
-		sudo yum install ruby-devel gcc make rpm-build
-	elif command_exists apt-get; then
-		sudo apt-get update -y
-		sudo apt-get install ruby-dev build-essential rpm python-pip python-dev
-	elif command_exists brew; then
-		brew install ruby
-	else
-		echo "Unable to install fpm dependencies" && exit 1
-	fi
-
-	gem install --no-document fpm
-
-	# https://github.com/iterative/dvc/issues/2970
-	gem uninstall -i /Users/travis/.rvm/gems/ruby-2.4.3@global rubygems-bundler
-
-	print_info "Installing requirements..."
-	pip install .[all]
-	pip install -r scripts/build-requirements.txt
+install_dependencies() {
+  print_info "Installing fpm..."
+  if command_exists dnf; then
+    sudo dnf install ruby-devel gcc make rpm-build
+  elif command_exists yum; then
+    sudo yum install ruby-devel gcc make rpm-build
+  elif command_exists apt-get; then
+    sudo apt-get update -y
+    sudo apt-get install ruby-dev build-essential rpm python-pip python-dev
+  elif command_exists brew; then
+    brew install ruby
+  else
+    echo "Unable to install fpm dependencies" && exit 1
+  fi
+
+  gem install --no-document fpm
+
+  # https://github.com/iterative/dvc/issues/2970
+  gem uninstall -i /Users/travis/.rvm/gems/ruby-2.4.3@global rubygems-bundler
+
+  print_info "Installing requirements..."
+  pip install .[all]
+  pip install -r scripts/build-requirements.txt
 }
 
-build_dvc()
-{
-	print_info "Building dvc binary..."
-	pyinstaller \
-            --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py \
-            --name dvc \
-            --distpath $LIB_DIR \
-            --specpath $BUILD_DIR
-
-	$LIB_DIR/dvc/dvc --help
-
-	# NOTE: in osxpkg fpm replaces symlinks with actual file that it
-	# points to, so we need to use after-install hook. See FPM_FLAGS
-	# above.
-	if [[ "$(uname)" == 'Linux' ]]; then
-		mkdir -p $BIN_DIR
-		pushd $BIN_DIR
-		ln -s ../lib/dvc/dvc dvc
-		popd
-		$BIN_DIR/dvc --help
-	fi
-
-        # NOTE: temporarily not adding scripts to mac package. See [1]
-        # [1] https://github.com/iterative/dvc/issues/2585
-        if [[ "$(uname)" == 'Linux' ]]; then
-            mkdir -p $BUILD_DIR/$BASH_CMPLT_DIR
-            cp scripts/completion/dvc.bash $BUILD_DIR/$BASH_CMPLT_DIR/dvc
-
-            mkdir -p $BUILD_DIR/$ZSH_CMPLT_DIR
-            cp scripts/completion/dvc.zsh $BUILD_DIR/$ZSH_CMPLT_DIR
-        fi
+build_dvc() {
+  print_info "Building dvc binary..."
+  pyinstaller \
+    --additional-hooks-dir $(pwd)/scripts/hooks dvc/__main__.py \
+    --name dvc \
+    --distpath $LIB_DIR \
+    --specpath $BUILD_DIR
+
+  $LIB_DIR/dvc/dvc --help
+
+  # NOTE: in osxpkg fpm replaces symlinks with actual file that it
+  # points to, so we need to use after-install hook. See FPM_FLAGS
+  # above.
+  if [[ "$(uname)" == 'Linux' ]]; then
+    mkdir -p $BIN_DIR
+    pushd $BIN_DIR
+    ln -s ../lib/dvc/dvc dvc
+    popd
+    $BIN_DIR/dvc --help
+  fi
+
+  # NOTE: temporarily not adding scripts to mac package. See [1]
+  # [1] https://github.com/iterative/dvc/issues/2585
+  if [[ "$(uname)" == 'Linux' ]]; then
+    mkdir -p $BUILD_DIR/$BASH_CMPLT_DIR
+    cp scripts/completion/dvc.bash $BUILD_DIR/$BASH_CMPLT_DIR/dvc
+
+    mkdir -p $BUILD_DIR/$ZSH_CMPLT_DIR
+    cp scripts/completion/dvc.zsh $BUILD_DIR/$ZSH_CMPLT_DIR
+  fi
 }
 
-build()
-{
-	cleanup
-	echo "PKG = \"$1\"" > dvc/utils/build.py
-	build_dvc
-	fpm_build $1
+build() {
+  cleanup
+  echo "PKG = \"$1\"" >dvc/utils/build.py
+  build_dvc
+  fpm_build $1
 }
 
 install_dependencies
 
 if [[ "$(uname)" == 'Linux' ]]; then
-	build rpm
-	build deb
+  build rpm
+  build deb
 else
-	build osxpkg
+  build osxpkg
 fi
 
 cleanup

diff --git a/scripts/build_snap.sh b/scripts/build_snap.sh
@@ -18,8 +18,8 @@ sudo snap install --dangerous --classic dvc_*.snap
 if [[ -n "$TRAVIS_TAG" ]]; then
   # Make sure we have a correct version
   if [[ "$(dvc --version)" != "$TRAVIS_TAG" ]]; then
-      echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2
-      exit 1
+    echo "ERROR: 'dvc --version'$(dvc -V) doesn't match '$TRAVIS_TAG'" >&2
+    exit 1
   fi
 fi
 # ensure basic commands can run

diff --git a/scripts/ci/before_install.sh b/scripts/ci/before_install.sh
@@ -6,53 +6,53 @@ set -e
 scriptdir="$(dirname $0)"
 
 if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    ulimit -a
-    sudo sysctl -w kern.maxproc=2048
-    sudo sysctl -w kern.maxprocperuid=2048
-    echo '\nulimit -u 2048' >> ~/.bash_profile
-    ulimit -a
+  ulimit -a
+  sudo sysctl -w kern.maxproc=2048
+  sudo sysctl -w kern.maxprocperuid=2048
+  echo '\nulimit -u 2048' >>~/.bash_profile
+  ulimit -a
 fi
 
-echo > env.sh
+echo >env.sh
 
 if [[ "$TRAVIS_BUILD_STAGE_NAME" == "Test" ]]; then
-    if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
-        # NOTE: ssh keys for ssh test to be able to ssh to the localhost
-        ssh-keygen -t rsa -N "" -f mykey
-        mkdir -p ~/.ssh
-        cp mykey ~/.ssh/id_rsa
-        cp mykey.pub ~/.ssh/id_rsa.pub
-        cat mykey.pub >> ~/.ssh/authorized_keys
-        ssh-keyscan localhost >> ~/.ssh/known_hosts
-        ssh localhost ls &> /dev/null
-        ssh-keyscan 127.0.0.1 >> ~/.ssh/known_hosts
-        ssh 127.0.0.1 ls &> /dev/null
-        ssh-keyscan 0.0.0.0 >> ~/.ssh/known_hosts
-        ssh 0.0.0.0 ls &> /dev/null
-    fi
-
-    if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-      bash "$scriptdir/install_azurite.sh"
-      bash "$scriptdir/install_oss.sh"
-      bash "$scriptdir/install_hadoop.sh"
-    fi
-
-    if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
-        brew install openssl
-        $scriptdir/retry.sh brew cask install google-cloud-sdk
-    fi
+  if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then
+    # NOTE: ssh keys for ssh test to be able to ssh to the localhost
+    ssh-keygen -t rsa -N "" -f mykey
+    mkdir -p ~/.ssh
+    cp mykey ~/.ssh/id_rsa
+    cp mykey.pub ~/.ssh/id_rsa.pub
+    cat mykey.pub >>~/.ssh/authorized_keys
+    ssh-keyscan localhost >>~/.ssh/known_hosts
+    ssh localhost ls &>/dev/null
+    ssh-keyscan 127.0.0.1 >>~/.ssh/known_hosts
+    ssh 127.0.0.1 ls &>/dev/null
+    ssh-keyscan 0.0.0.0 >>~/.ssh/known_hosts
+    ssh 0.0.0.0 ls &>/dev/null
+  fi
+
+  if [ "$TRAVIS_OS_NAME" == "linux" ]; then
+    bash "$scriptdir/install_azurite.sh"
+    bash "$scriptdir/install_oss.sh"
+    bash "$scriptdir/install_hadoop.sh"
+  fi
+
+  if [[ "$TRAVIS_OS_NAME" == "osx" && "$TRAVIS_PULL_REQUEST" == "false" ]]; then
+    brew install openssl
+    $scriptdir/retry.sh brew cask install google-cloud-sdk
+  fi
 fi
 
 if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then
-    $scriptdir/retry.sh choco install python --version 3.7.5
-    echo 'PATH="/c/Python37:/c/Python37/Scripts:$PATH"' >> env.sh
+  $scriptdir/retry.sh choco install python --version 3.7.5
+  echo 'PATH="/c/Python37:/c/Python37/Scripts:$PATH"' >>env.sh
 elif [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-    ln -s -f /usr/local/bin/python3 /usr/local/bin/python
-    ln -s -f /usr/local/bin/pip3 /usr/local/bin/pip
+  ln -s -f /usr/local/bin/python3 /usr/local/bin/python
+  ln -s -f /usr/local/bin/pip3 /usr/local/bin/pip
 fi
 
 if [[ -n "$TRAVIS_TAG" ]]; then
-    echo "export SNAP_CHANNEL=stable" >> env.sh
+  echo "export SNAP_CHANNEL=stable" >>env.sh
 else
-    echo "export SNAP_CHANNEL=edge" >> env.sh
+  echo "export SNAP_CHANNEL=edge" >>env.sh
 fi
diff --git a/scripts/ci/check_patch.sh b/scripts/ci/check_patch.sh
@@ -3,7 +3,7 @@
 set -x
 set -e
 
-pip install Pygments collective.checkdocs pre-commit 
+pip install Pygments collective.checkdocs pre-commit
 
 # stop the build if there are any readme formatting errors
 python setup.py checkdocs