admin/topgrade
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix building for Android, enable tlmgr updates (#896)

Browse Source 
* fix(os/unix): cannot find `SkipStep` while building for android

ERROR: cannot find function, tuple struct or tuple variant `SkipStep`

Disable updating gnome extensions for Android.

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>

* feat: enable `tlmgr` updates for android

Signed-off-by: Aditya Alok <dev.aditya.alok@gmail.com>
This commit is contained in:
Aditya Alok
2022-04-23 01:50:17 +05:30
committed by GitHub
parent 5d0f09cf5c
commit ff7a4f3df9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.rs
View File

@@ -280,7 +280,7 @@ fn run() -> Result<()> {
runner.execute(Step::Tmux, "tmux", || tmux::run_tpm(&base_dirs, run_type))?; runner.execute(Step::Tmux, "tmux", || tmux::run_tpm(&base_dirs, run_type))?;
runner.execute(Step::Tldr, "TLDR", || unix::run_tldr(run_type))?; runner.execute(Step::Tldr, "TLDR", || unix::run_tldr(run_type))?;
runner.execute(Step::Pearl, "pearl", || unix::run_pearl(run_type))?; runner.execute(Step::Pearl, "pearl", || unix::run_pearl(run_type))?;
#[cfg(not(target_os = "macos"))] #[cfg(not(any(target_os = "macos", target_os = "android")))]
runner.execute(Step::GnomeShellExtensions, "Gnome Shell Extensions", || { runner.execute(Step::GnomeShellExtensions, "Gnome Shell Extensions", || {
unix::upgrade_gnome_extensions(&ctx) unix::upgrade_gnome_extensions(&ctx)
})?; })?;

4
src/steps/generic.rs
View File

@@ -285,9 +285,9 @@ pub fn run_stack_update(run_type: RunType) -> Result<()> {
pub fn run_tlmgr_update(ctx: &ExecutionContext) -> Result<()> { pub fn run_tlmgr_update(ctx: &ExecutionContext) -> Result<()> {
cfg_if::cfg_if! { cfg_if::cfg_if! {
if #[cfg(target_os = "linux")] { if #[cfg(any(target_os = "linux", target_os = "android"))] {
if !ctx.config().enable_tlmgr_linux() { if !ctx.config().enable_tlmgr_linux() {
return Err(SkipStep(String::from("tlmgr must be explicity enabled in the configuration to run in Linux")).into()); return Err(SkipStep(String::from("tlmgr must be explicity enabled in the configuration to run in Android/Linux")).into());
} }
} }
} }

2
src/steps/os/unix.rs
View File

@@ -135,7 +135,7 @@ pub fn run_fish_plug(ctx: &ExecutionContext) -> Result<()> {
ctx.run_type().execute(&fish).args(&["-c", "plug update"]).check_run() ctx.run_type().execute(&fish).args(&["-c", "plug update"]).check_run()
} }
#[cfg(not(target_os = "macos"))] #[cfg(not(any(target_os = "android", target_os = "macos")))]
pub fn upgrade_gnome_extensions(ctx: &ExecutionContext) -> Result<()> { pub fn upgrade_gnome_extensions(ctx: &ExecutionContext) -> Result<()> {
let gdbus = require("gdbus")?; let gdbus = require("gdbus")?;
require_option( require_option(