diff options
author | Brian Anderson <banderson@mozilla.com> | 2015-02-11 09:58:37 -0800 |
---|---|---|
committer | Brian Anderson <banderson@mozilla.com> | 2015-02-11 09:58:37 -0800 |
commit | e8caf863d7cb4f2493ed2fbc74f69644ff9415d3 (patch) | |
tree | 175e0835d9004b0e049fb933185478605fa78f05 | |
parent | bd3d1ca1cbef6bafaf91b85fc5e3a2a7a73fcc58 (diff) | |
download | rust-installer-e8caf863d7cb4f2493ed2fbc74f69644ff9415d3.tar.gz |
--disable-verify is obsolete but does nothing
-rw-r--r-- | install-template.sh | 2 | ||||
-rwxr-xr-x | test.sh | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/install-template.sh b/install-template.sh index f96a484..adbcc2f 100644 --- a/install-template.sh +++ b/install-template.sh @@ -693,7 +693,6 @@ VAL_OPTIONS="" flag uninstall "only uninstall from the installation prefix" valopt destdir "" "set installation root" -opt verify 1 "verify that the installed binaries run correctly" valopt prefix "/usr/local" "set installation prefix" # Avoid prepending an extra / to the prefix path if there's no destdir @@ -710,6 +709,7 @@ valopt mandir "$CFG_DESTDIR_PREFIX/share/man" "install man pages in PATH" opt ldconfig 1 "run ldconfig after installation (Linux only)" valopt components "" "comma-separated list of components to install" flag list-components "list available components" +opt verify 1 "obsolete" flag verbose "run with verbose output" if [ $HELP -eq 1 ] @@ -1132,6 +1132,16 @@ destdir_no_trailing_slash() { } runtest destdir_no_trailing_slash +disable_verify_noop() { + # Obsolete --disable-verify flag doesn't generate error + try sh "$S/gen-installer.sh" \ + --image-dir="$TEST_DIR/image1" \ + --work-dir="$WORK_DIR" \ + --output-dir="$OUT_DIR" + try "$WORK_DIR/package/install.sh" --prefix="$PREFIX_DIR" --disable-verify +} +runtest disable_verify_noop + # TODO: mandir/libdir/bindir, etc. |