diff --git a/.gitignore b/.gitignore index c90cc388..14461519 100644 --- a/.gitignore +++ b/.gitignore @@ -27,4 +27,7 @@ backup/ lib/ # Application bundle for Mac OS -*.app/ \ No newline at end of file +*.app/ + +# Compiled translations +/out/locale/heidisql.*.mo diff --git a/create-deb-package.sh b/create-deb-package.sh index 7248884b..1bf1f0c2 100755 --- a/create-deb-package.sh +++ b/create-deb-package.sh @@ -39,7 +39,7 @@ echo Build executable... lazbuild heidisql.lpi # create directory and prepare files -packageDir="$APPNAME-$fullVer" +packageDir="$APPNAME_$fullVer" echo Creating package directory $packageDir cp -R deb-package-skeleton $packageDir rm $packageDir/usr/share/heidisql/locale/.gitkeep diff --git a/source/updatecheck.pas b/source/updatecheck.pas index 80cfddac..e96585fa 100644 --- a/source/updatecheck.pas +++ b/source/updatecheck.pas @@ -149,7 +149,7 @@ begin // Prepare download CheckfileDownload := THttpDownload.Create(Self); CheckfileDownload.TimeOut := 5; - CheckfileDownload.URL := APPDOMAIN+'updatecheck.php?r='+IntToStr(Mainform.AppVerRevision)+'&bits='+IntToStr(GetExecutableBits)+'&t='+EncodeURLParam(DateTimeToStr(Now)); + CheckfileDownload.URL := APPDOMAIN+'updatecheck.php?r='+IntToStr(Mainform.AppVerRevision)+'&bits='+IntToStr(GetExecutableBits)+'&os='+EncodeURLParam(GetOS.ToLower)+'&t='+EncodeURLParam(DateTimeToStr(Now)); CheckFilename := GetTempDir + APPNAME + '_updatecheck.ini'; // Download the check file @@ -256,9 +256,10 @@ end; function TfrmUpdateCheck.GetLinkUrl(Sender: TObject; LinkType: String): String; var - DownloadParam, PlaceParam: String; + DownloadParam, PlaceParam, OsParam: String; begin PlaceParam := 'place='+EncodeURLParam(TWinControl(Sender).Name); + OsParam := 'os='+EncodeURLParam(GetOS.ToLower); if LinkType = SLinkDownloadRelease then begin if AppSettings.PortableMode then begin @@ -269,7 +270,7 @@ begin end else begin DownloadParam := 'download=installer'; end; - Result := 'download.php?'+DownloadParam+'&'+PlaceParam; + Result := 'download.php?'+DownloadParam+'&'+PlaceParam+'&'+OsParam; end else if LinkType = SLinkChangelog then begin