Merge remote-tracking branch 'origin/stable' into rc/v2.1

Author: borsboom

doc/README.md

@@ -77,18 +77,21 @@ The `stack new` command should have created the following files:
 
 ```
 .
-├── LICENSE
-├── Setup.hs
 ├── app
 │   └── Main.hs
+├── ChangeLog.md
+├── LICENSE
 ├── my-project.cabal
+├── package.yaml
+├── README.md
+├── Setup.hs
 ├── src
 │   └── Lib.hs
 ├── stack.yaml
 └── test
     └── Spec.hs
 
-    3 directories, 7 files
+    3 directories, 10 files
 ```
 
 So to manage your library:

doc/nonstandard_project_init.md

@@ -109,14 +109,15 @@ For further information see [YAML configuration](yaml_configuration.md)
   - https://github.com/commercialhaskell/stack/issues/565
 
 ## Custom Snapshots
-Currently WIP?
+See [Custom Snapshots](custom_snapshot.md).
+
 ### Issues Referenced
   - https://github.com/commercialhaskell/stack/issues/111
   - https://github.com/commercialhaskell/stack/issues/253
   - https://github.com/commercialhaskell/stack/issues/137
 
 ## Intra-package Targets
-stack supports intra-package targets, similar to `cabal build COMPONENTS` for
+Stack supports intra-package targets, similar to `cabal build COMPONENTS` for
 situations when you don't want to build every target inside your package.
 
 Example:

etc/scripts/get-stack.sh

@@ -610,13 +610,15 @@ try_install_pkgs() {
 
 # Install packages using apt-get
 apt_get_install_pkgs() {
-  # Grepping the output of dpkg-query and checking the overall status of the pipeline
-  # causes differing behaviors across various shell versions. So it is more portable to
-  # just check the staus of dpkg-query.
-  # See https://github.com/commercialhaskell/stack/pull/4770#pullrequestreview-229732166
-  if dpkg-query -W "$@" > /dev/null 2>&1; then
+  missing=
+  for pkg in $*; do
+    if ! dpkg -s $pkg 2>/dev/null |grep '^Status:.*installed' >/dev/null; then
+      missing="$missing $pkg"
+    fi
+  done
+  if [ "$missing" = "" ]; then
     info "Already installed!"
-  elif ! sudocmd "install required system dependencies" apt-get install -y ${QUIET:+-qq} "$@"; then
+  elif ! sudocmd "install required system dependencies" apt-get install -y ${QUIET:+-qq}$missing; then
     die "Installing apt packages failed.  Please run 'apt-get update' and try again."
   fi
 }