From b5978e738d1f9fce229afc83c0dc98f1be44a82f Mon Sep 17 00:00:00 2001 From: next-autumn Date: Tue, 9 Mar 2021 18:18:29 +0800 Subject: [PATCH] merge --- ProxySU_Core/ViewModels/Developers/Project.cs | 4 +++- ProxySU_Core/Views/TerminalWindow.xaml | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ProxySU_Core/ViewModels/Developers/Project.cs b/ProxySU_Core/ViewModels/Developers/Project.cs index dc6cce5..ed785e8 100644 --- a/ProxySU_Core/ViewModels/Developers/Project.cs +++ b/ProxySU_Core/ViewModels/Developers/Project.cs @@ -359,12 +359,14 @@ namespace ProxySU_Core.ViewModels.Developers { RunCmd("dnf install 'dnf-command(copr)'"); RunCmd("dnf copr enable @caddy/caddy"); + RunCmd(GetUpdateCmd()); RunCmd("dnf install caddy"); } else if (CmdType == CmdType.Yum) { - RunCmd("yum install yum-plugin-copr"); + RunCmd("y | yum install yum-plugin-copr"); RunCmd("yum copr enable @caddy/caddy"); + RunCmd(GetUpdateCmd()); RunCmd("yum install caddy"); } } diff --git a/ProxySU_Core/Views/TerminalWindow.xaml b/ProxySU_Core/Views/TerminalWindow.xaml index 0820d2d..a1fcfbd 100644 --- a/ProxySU_Core/Views/TerminalWindow.xaml +++ b/ProxySU_Core/Views/TerminalWindow.xaml @@ -54,7 +54,7 @@ Themezy - Themezy + One Page Love HTML5 UP