summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.cargo/config.toml16
-rw-r--r--deploy.ps12
-rw-r--r--templates/setup_jv_cli.iss2
3 files changed, 10 insertions, 10 deletions
diff --git a/.cargo/config.toml b/.cargo/config.toml
index 81b27e1..93f2182 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -20,16 +20,16 @@ binaries = [
# Completions
[copies.completion_jv_bash]
-from = "scripts/completions/bash/completion_jv.sh"
+from = "scripts/deploy/completions/bash/completion_jv.sh"
to = "completions/bash/completion_jv.sh"
[copies.completion_jvv_bash]
-from = "scripts/completions/bash/completion_jvv.sh"
+from = "scripts/deploy/completions/bash/completion_jvv.sh"
to = "completions/bash/completion_jvv.sh"
# Entries
[copies.entry_bash]
-from = "scripts/jv_cli.sh"
+from = "scripts/deploy/jv_cli.sh"
to = "jv_cli.sh"
##################
@@ -38,16 +38,16 @@ to = "jv_cli.sh"
# Completions
[copies.completion_jv_powershell]
-from = "scripts/completions/powershell/completion_jv.ps1"
+from = "scripts/deploy/completions/powershell/completion_jv.ps1"
to = "completions/powershell/completion_jv.ps1"
[copies.completion_jvv_powershell]
-from = "scripts/completions/powershell/completion_jvv.ps1"
+from = "scripts/deploy/completions/powershell/completion_jvv.ps1"
to = "completions/powershell/completion_jvv.ps1"
# Entries
[copies.entry_powershell]
-from = "scripts/jv_cli.ps1"
+from = "scripts/deploy/jv_cli.ps1"
to = "jv_cli.ps1"
##################
@@ -55,9 +55,9 @@ to = "jv_cli.ps1"
##################
[copies.zsh_plugin]
-from = "scripts/zsh_support/jvcs.plugin.zsh"
+from = "scripts/deploy/zsh_support/jvcs.plugin.zsh"
to = "scripts/zsh_support/jvcs.plugin.zsh"
[copies.zsh_plugin_installation]
-from = "scripts/zsh_support/how_to_install.md"
+from = "scripts/deploy/zsh_support/how_to_install.md"
to = "scripts/zsh_support/how_to_install.md"
diff --git a/deploy.ps1 b/deploy.ps1
index fb51be4..643cc5f 100644
--- a/deploy.ps1
+++ b/deploy.ps1
@@ -16,7 +16,7 @@ if (-not $isccPath) {
}
# Build
-$env:CARGO_BUILD_RERUN_IF_ENV_CHANGED="FORCE_BUILD=$(Get-Date -Format 'mmss')"
+$env:FORCE_BUILD=$(Get-Date -Format 'mmss')
cargo build --workspace --release
if ($LASTEXITCODE -ne 0) {
# Build failed
diff --git a/templates/setup_jv_cli.iss b/templates/setup_jv_cli.iss
index 6763248..e1e50cd 100644
--- a/templates/setup_jv_cli.iss
+++ b/templates/setup_jv_cli.iss
@@ -16,7 +16,7 @@ DefaultGroupName={#MyAppName}
AllowNoIcons=yes
LicenseFile=..\..\LICENSE
PrivilegesRequired=lowest
-OutputDir=..\..\.temp\deploy\setup
+OutputDir=..\..\.temp\deploy\
OutputBaseFilename=JustEnoughVCS For Windows
SetupIconFile=..\..\resources\images\Yizi.ico
SolidCompression=yes