Add an option to force vim plug update (#795)

* Add an option to force vim plug update (fix #751)

* Rustfmt

* Update src/config.rs

Co-authored-by: M*C*O <mcofficer@gmx.de>

Co-authored-by: M*C*O <mcofficer@gmx.de>

src/config.rs

@@ -212,6 +212,12 @@ pub struct Composer {
     self_update: Option<bool>,
 }
 
+#[derive(Deserialize, Default, Debug)]
+#[serde(deny_unknown_fields)]
+pub struct Vim {
+    force_plug_update: Option<bool>,
+}
+
 #[derive(Deserialize, Default, Debug)]
 #[serde(deny_unknown_fields)]
 /// Configuration file
@@ -244,6 +250,7 @@ pub struct ConfigFile {
     git: Option<Git>,
     windows: Option<Windows>,
     npm: Option<NPM>,
+    vim: Option<Vim>,
     firmware: Option<Firmware>,
     vagrant: Option<Vagrant>,
     flatpak: Option<Flatpak>,
@@ -626,6 +633,15 @@ impl Config {
             .unwrap_or(false)
     }
 
+    /// Whether to force plug update in Vim
+    pub fn force_vim_plug_update(&self) -> bool {
+        self.config_file
+            .vim
+            .as_ref()
+            .and_then(|c| c.force_plug_update)
+            .unwrap_or_default()
+    }
+
     /// Whether to send a desktop notification at the beginning of every step
     #[allow(dead_code)]
     pub fn notify_each_step(&self) -> bool {

src/steps/upgrade.vim

@@ -11,7 +11,11 @@ endif
 if exists(":PlugUpgrade")
     echo "Plug"
     PlugUpgrade
-    PlugUpdate
+    if $TOPGRADE_FORCE_PLUGUPDATE
+        PlugUpdate!
+    else
+        PlugUpdate
+    endif
 endif
 
 if exists(":PackerUpdate")

src/steps/vim.rs

@@ -27,7 +27,7 @@ pub fn vimrc(base_dirs: &BaseDirs) -> Result<PathBuf> {
 
 fn nvimrc(base_dirs: &BaseDirs) -> Result<PathBuf> {
     #[cfg(unix)]
-    let base_dir =
+        let base_dir =
         // Bypass directories crate as nvim doesn't use the macOS-specific directories.
         std::env::var_os("XDG_CONFIG_HOME").map_or_else(|| base_dirs.home_dir().join(".config"), PathBuf::from);
 
@@ -45,14 +45,19 @@ fn upgrade(vim: &Path, vimrc: &Path, ctx: &ExecutionContext) -> Result<()> {
     tempfile.write_all(UPGRADE_VIM.replace('\r', "").as_bytes())?;
     debug!("Wrote vim script to {:?}", tempfile.path());
 
-    let output = ctx
-        .run_type()
-        .execute(&vim)
+    let mut command = ctx.run_type().execute(&vim);
+
+    command
         .args(&["-u"])
         .arg(vimrc)
         .args(&["-U", "NONE", "-V1", "-nNesS"])
-        .arg(tempfile.path())
-        .output()?;
+        .arg(tempfile.path());
+
+    if ctx.config().force_vim_plug_update() {
+        command.env("TOPGRADE_FORCE_PLUGUPDATE", "true");
+    }
+
+    let output = command.output()?;
 
     if let ExecutorOutput::Wet(output) = output {
         let status = output.status;