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

Revert apt get integration #467

Merged
merged 2 commits into from
Nov 16, 2021
Merged

Revert apt get integration #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d86f339
fixup! update-microsoft-git: interface with apt-get on Linux
ldennington Nov 15, 2021
471453e
fixup! Update Ubuntu/Debian install instructions
ldennington Nov 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 5 additions & 27 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,43 +101,21 @@ git version
scalar version
```

To upgrade `microsoft/git`, you can run the necessary `brew` commands:
To upgrade microsoft/git, you can run the necessary `brew` commands:

```shell
brew update
brew upgrade --cask microsoft-git
```

Or you can run the `git update-microsoft-git` command, which will run those
`brew` commands for you.
Or you can run the `git update-microsoft-git` command, which will run those brew commands for you.

## Linux

`apt-get` support is available for Ubuntu Hirsute
Hippo (21.04). Take the following steps to set up and install:

```shell
curl -sSL https://packages.microsoft.com/config/ubuntu/21.04/prod.list | sudo tee /etc/apt/sources.list.d/microsoft-prod.list
curl -sSL https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc
sudo apt-get update
sudo apt-get install microsoft-git
```

To upgrade `microsoft/git`, you can run the necessary `apt-get` commands:

```shell
sudo apt-get update
sudo apt-get upgrade microsoft-git
```

Or you can run the `git update-microsoft-git` command, which will run those
`apt-get` commands for you.

### Other Ubuntu/Debian distributions
### Ubuntu/Debian distributions

On newer distributions*, you may use the most recent
[`.deb` package](https://github.com/microsoft/git/releases). For example,
you can download a specific version as follows:
[Debian package](https://github.com/microsoft/git/releases). For
example, you can download a specific version as follows:

```shell
wget -O microsoft-git.deb https://github.com/microsoft/git/releases/download/v2.33.0.vfs.0.0/microsoft-git_2.33.0.vfs.0.0.deb
Expand Down
22 changes: 2 additions & 20 deletions builtin/update-microsoft-git.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,26 +56,8 @@ static int platform_specific_upgrade(void)
#else
static int platform_specific_upgrade(void)
{
int res;
struct strvec args = STRVEC_INIT;

printf("Updating apt-get with 'sudo apt-get update'\n\n");

strvec_pushl(&args, "sudo", "apt-get", "update", NULL);
res = run_command_v_opt(args.v, 0);
strvec_clear(&args);

if (res) {
error(_("'sudo apt-get update' failed; is apt-get installed?"));
return 1;
}

printf("\nUpgrading microsoft-git with 'sudo apt-get upgrade microsoft-git'\n\n");
strvec_pushl(&args, "sudo", "apt-get", "upgrade", "microsoft-git", NULL);
res = run_command_v_opt(args.v, 0);
strvec_clear(&args);

return res;
error(_("update-microsoft-git is not supported on this platform"));
return 1;
}
#endif

Expand Down