Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Windows: support the /S switch for restricted user accounts running silent installations #6

Merged
merged 18 commits into from
Nov 21, 2012
Merged

Windows: support the /S switch for restricted user accounts running silent installations #6

merged 18 commits into from
Nov 21, 2012

Commits on Nov 1, 2012

  1. windows: Don't try to install to c:\ProgramData if c:\Program Files f… 

    …ails.

Previously the Windows installer was intending to try each of the following
folders in turn until one with write access was found

Windows XP
----------

* c:\Program Files
* c:\Documents and Settings\All Users\Application Data
* c:\Documents and Settings\<current user>\Application Data

Windows 7
---------

* c:\Program Files or c:\Program Files (x86)
* c:\ProgramData
* c:\Users\<current user>\AppData\roaming

What was actually happening was that if the second path was checked for and
was found to be writable by the current user, then the 3rd option would be
chosen. If the current user did not have write access to the second path,
however, then that path would be chosen.

A user running the installer with administrative access should be able to put
programs in the first path. Should this not be the case, it would be better to
abort the installation rather than look for an alternate place to install the
software system-wide.

With this patch the behavior is as follows. First the installer will check
whether it has write access to the system wide location ("c:\Program Files" or
"c:\Program Files (x86)"). If this fails it will fall pack on a per-user
installation.
    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    d37d7e7 View commit details
    Browse the repository at this point in the history

  2. Check for a currently running installation even when running silently.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    8ddf35d View commit details
    Browse the repository at this point in the history

  3. AddDesktopSC variable assigned to in .oninit. UI's selection depends … 

    …on existing value.
    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    a023e1f View commit details
    Browse the repository at this point in the history

  4. Define DESKTOP_SHORTCUT_* defines for the AddDesktopSC variable.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    c6bd1b3 View commit details
    Browse the repository at this point in the history

  5. AddStartMenuSC variable assigned to in .oninit. UI's selection depend… 

    …s on existing value.
    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    6a66249 View commit details
    Browse the repository at this point in the history

  6. Define START_MENU_SHORTCUT_* defines for the AddStartMenuSC variable.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    ef49a81 View commit details
    Browse the repository at this point in the history

  7. adjust line wrapping in comment.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    25188f1 View commit details
    Browse the repository at this point in the history

  8. AddQuickLaunchSC variable assigned to in .oninit. UI's selection depe… 

    …nds on existing value.
    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    acf334e View commit details
    Browse the repository at this point in the history

  9. Define QUICKLAUNCH_SHORTCUT_* defines for the AddQuickLaunchSC variable.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    f4f11ce View commit details
    Browse the repository at this point in the history

  10. AddQuickLaunchSC indicates user preference. Its value should not depe… 

    …nd on which version of Windows is installed.
    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    60e2b2f View commit details
    Browse the repository at this point in the history

  11. Ensure CheckExistingInstall gets called even in silent installation.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    49766ec View commit details
    Browse the repository at this point in the history

  12. Remove CheckCustomCommon. It was only called from one place.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    18886e7 View commit details
    Browse the repository at this point in the history

  13. Remove PreDirectoryCommon. It was only called from one place.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    83456cc View commit details
    Browse the repository at this point in the history

  14. Remove LeaveDirectoryCommon. It was only called from one place.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    38dd10d View commit details
    Browse the repository at this point in the history

  15. silent install: Check that there is write access and disk space in th… 

    …e installation directory.
    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    33e1214 View commit details
    Browse the repository at this point in the history

  16. Move INSTALLTYPE_* defines to defines.nsi.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    cbd04cd View commit details
    Browse the repository at this point in the history

  17. Set InstallType once in .oninit and once more in the UI. Add a define… 

    … for the default option.
    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    e0391a6 View commit details
    Browse the repository at this point in the history

  18. silent install: Correct default install location.

    @mikesteele81
    mikesteele81 committed Nov 1, 2012
    Configuration menu
    Copy the full SHA
    77550d0 View commit details
    Browse the repository at this point in the history