From 45afdc25f91c0c9736692b9795132050add0be69 Mon Sep 17 00:00:00 2001
From: Pierre-Antoine Rouby <pierre-antoine.rouby@inrae.fr>
Date: Mon, 16 Oct 2023 11:41:59 +0200
Subject: [PATCH] packages: Fix motd.txt missing and pip version in linux.sh.
---
.gitlab-ci.yml | 1 +
packages/linux.sh | 2 ++
packages/make-windows-dir.bat | 1 +
3 files changed, 4 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4f735f12..863629f7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -169,6 +169,7 @@ build-linux:
- cp -v ../VERSION pamhyr/pamhyr/_internal/
- cp -v ../AUTHORS pamhyr/pamhyr/_internal/
- cp -v ../LICENSE pamhyr/pamhyr/_internal/
+ - cp -v ../src/motd.txt pamhyr/pamhyr/_internal/
# Copy mage
- mkdir -p pamhyr/mage
- cp -v ../mage-linux/* pamhyr/mage/
diff --git a/packages/linux.sh b/packages/linux.sh
index 9a5787a7..b6177eb4 100755
--- a/packages/linux.sh
+++ b/packages/linux.sh
@@ -25,6 +25,7 @@ echo " *** SETUP ENV"
python3 -m venv linux-pamhyr-venv
. linux-pamhyr-venv/bin/activate
+pip3 install -U pip
pip3 install -r ../requirements.txt
echo " *** PYINSTALL"
@@ -58,6 +59,7 @@ VERSION=$(cat ../VERSION)
echo "local-build-$VERSION" > dist/pamhyr/_internal/VERSION
cp ../AUTHORS dist/pamhyr/_internal/
cp ../LICENSE dist/pamhyr/_internal/
+cp ../src/motd.txt dist/pamhyr/_internal/
mkdir -p dist/pamhyr/mage/
cp ../mage/mage dist/pamhyr/mage/
diff --git a/packages/make-windows-dir.bat b/packages/make-windows-dir.bat
index 0f35ba28..28eccbc4 100644
--- a/packages/make-windows-dir.bat
+++ b/packages/make-windows-dir.bat
@@ -36,6 +36,7 @@ rem Information
copy /y ..\VERSION pamhyr\pamhyr\_internal
copy /y ..\AUTHORS pamhyr\pamhyr\_internal
copy /y ..\LICENSE pamhyr\pamhyr\_internal
+copy /y ..\src\motd.txt pamhyr\pamhyr\_internal
rem MAGE
mkdir pamhyr\mage
--
GitLab