From 87abd0c970c49531c4830a6b0f49556da673516a Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 6 Jul 2026 04:03:01 +0200 Subject: [PATCH] =?UTF-8?q?Version=202.0.2=20:=20suppression=20de=20versio?= =?UTF-8?q?n.txt,=20v=C3=A9rification=20de=20version=20bas=C3=A9e=20sur=20?= =?UTF-8?q?cadMasterCLI.ps1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Détail : - Test-CadMasterUpdate lit désormais $CADMASTER_VERSION directement dans le cadMasterCLI.ps1 distant (regex) au lieu d'un fichier version.txt séparé - Suppression de version.txt (plus utilisé) et de sa mention dans README.md --- README.md | 1 - cadMasterCLI.ps1 | 11 +++++++---- version.txt | 1 - 3 files changed, 7 insertions(+), 6 deletions(-) delete mode 100644 version.txt diff --git a/README.md b/README.md index c753803..c755ffe 100644 --- a/README.md +++ b/README.md @@ -195,7 +195,6 @@ Si le serveur Gitea est inaccessible (pas de réseau), cadMasterCLI utilise auto ``` cadMasterCLI/ ├── cadMasterCLI.ps1 ← fichier principal à lancer -├── version.txt ← version de référence pour l'auto-mise à jour ├── cadmastercli.config.json ← préférence de langue (créé automatiquement) ├── README.md ← cette documentation ├── doc_contribution/ diff --git a/cadMasterCLI.ps1 b/cadMasterCLI.ps1 index 7b83fb7..30491aa 100644 --- a/cadMasterCLI.ps1 +++ b/cadMasterCLI.ps1 @@ -8,7 +8,7 @@ $GITEA_ORG = "ScriptPowerShell" # Nom de l'organisation Gitea $GITEA_BRANCH = "main" $LOCAL_CACHE_DIR = "$PSScriptRoot\scripts" -$CADMASTER_VERSION = "2.0.1" +$CADMASTER_VERSION = "2.0.2" $CADMASTER_UPDATE_ORG = "DistechControls" # Organisation Gitea hebergeant cadMasterCLI lui-meme $CADMASTER_UPDATE_REPO = "cadMasterCLI" $CADMASTER_CONFIG_PATH = "$PSScriptRoot\cadmastercli.config.json" @@ -424,9 +424,12 @@ function Invoke-ScriptDownload { # ===================================================================== function Test-CadMasterUpdate { try { - $url = "$GITEA_BASE_URL/api/v1/repos/$CADMASTER_UPDATE_ORG/$CADMASTER_UPDATE_REPO/raw/version.txt?ref=$GITEA_BRANCH" - $remote = (Invoke-RestMethod -Uri $url -Method Get -TimeoutSec 10 -ErrorAction Stop).ToString().Trim() - if ([version]$remote -gt [version]$CADMASTER_VERSION) { return $remote } + $url = "$GITEA_BASE_URL/api/v1/repos/$CADMASTER_UPDATE_ORG/$CADMASTER_UPDATE_REPO/raw/cadMasterCLI.ps1?ref=$GITEA_BRANCH" + $content = Invoke-RestMethod -Uri $url -Method Get -TimeoutSec 10 -ErrorAction Stop + if ($content -match '\$CADMASTER_VERSION\s*=\s*"([\d.]+)"') { + $remote = $Matches[1] + if ([version]$remote -gt [version]$CADMASTER_VERSION) { return $remote } + } } catch { } return $null diff --git a/version.txt b/version.txt deleted file mode 100644 index 38f77a6..0000000 --- a/version.txt +++ /dev/null @@ -1 +0,0 @@ -2.0.1