From 1002929c77d34e3deb8a708a84a46412479694b6 Mon Sep 17 00:00:00 2001 From: mattias Date: Sun, 25 Jun 2023 19:39:07 +0200 Subject: [PATCH] deb: fixed export tgz, fixed RC version number turning RC into .0 --- tools/install/create_lazarus_deb.sh | 3 ++- tools/install/create_lazarus_export_tgz.sh | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/install/create_lazarus_deb.sh b/tools/install/create_lazarus_deb.sh index b976f7b1c4..32cf26f620 100755 --- a/tools/install/create_lazarus_deb.sh +++ b/tools/install/create_lazarus_deb.sh @@ -112,7 +112,7 @@ fi FPCVersion=$($ppcbin -v | grep version| sed 's/.*\([0-9]\+\.[0-9]\+\.[0-9]\+\).*/\1/') # get Lazarus version -LazVersion=$(./get_lazarus_version.sh) +LazVersion=$(./get_lazarus_version.sh | sed -e 's/RC[0-9]/.0/') # get consistent major.minor.release version, to avoid dpkg install an older version if [ $(echo $LazVersion | egrep '^[^.]*\.[^.]*$') ]; then LazVersion=${LazVersion}.0 @@ -159,6 +159,7 @@ cd - if [ "$UseCHMHelp" = "1" ]; then echo echo "Copying chm files" + mkdir -p $LazDestDir/docs/chm cd $LazSrcDir/docs/chm cp -v *.kwd *.chm $LazDestDir/docs/chm/ cd - diff --git a/tools/install/create_lazarus_export_tgz.sh b/tools/install/create_lazarus_export_tgz.sh index bf56d72dcc..cb9c0631b1 100755 --- a/tools/install/create_lazarus_export_tgz.sh +++ b/tools/install/create_lazarus_export_tgz.sh @@ -81,7 +81,6 @@ else LazSrcDir=$(pwd | sed -e 's#/tools/install.*$##') # old-svn: Revision=$(svnversion $LazSrcDir) - comment this out as svn no longer works Revision=$(git -C $LazSrcDir describe --always --first-parent) - cd $TmpDir # old-svn: cp -a $LazSrcDir $TmpLazDir mkdir $TmpLazDir cd $TmpLazDir