diff --git a/build-and-package.sh b/build-and-package.sh new file mode 100755 index 0000000..92f75ff --- /dev/null +++ b/build-and-package.sh @@ -0,0 +1,14 @@ +#!/usr/bin/env sh + +cd $(dirname $0) + +app_version=MercuryConverter-v$(cat src/Assets/version) + +# create builds +dotnet publish src --runtime linux-x64 -c Release -p:PublishSingleFile=True -o "./builds/$app_version-linux-x64" +dotnet publish src --runtime win-x64 -c Release -p:PublishSingleFile=True -o "./builds/$app_version-win-x64" + +# package builds +cd builds +zip -r "$app_version-linux-x64.zip" "$app_version-linux-x64" +zip -r "$app_version-win-x64.zip" "$app_version-win-x64" diff --git a/convert-videos.bat b/dist/convert-videos.bat similarity index 100% rename from convert-videos.bat rename to dist/convert-videos.bat diff --git a/convert-videos.sh b/dist/convert-videos.sh similarity index 100% rename from convert-videos.sh rename to dist/convert-videos.sh diff --git a/scripts/build-and-package.sh b/scripts/build-and-package.sh deleted file mode 100755 index 8384a40..0000000 --- a/scripts/build-and-package.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env sh - -cd $(dirname $0)/.. - -app_version=MercuryConverter-v$(cat src/Assets/version) - -# create builds -dotnet publish src --runtime linux-x64 -o "./builds/$app_version-linux-x64" -dotnet publish src --runtime win-x64 -o "./builds/$app_version-win-x64" - -# package builds -cd builds -zip -r "$app_version-linux-x64.zip" "$app_version-linux-x64" -zip -r "$app_version-win-x64.zip" "$app_version-win-x64" \ No newline at end of file diff --git a/src/Assets/version b/src/Assets/version index 56a6051..b123147 100644 --- a/src/Assets/version +++ b/src/Assets/version @@ -1 +1 @@ -1 \ No newline at end of file +1.1 \ No newline at end of file diff --git a/src/Utility/Utils.cs b/src/Utility/Utils.cs index 3ddb6f3..b01496b 100644 --- a/src/Utility/Utils.cs +++ b/src/Utility/Utils.cs @@ -65,7 +65,7 @@ public static class Utils if (_ffmpegAvailable == null) { var testVidPath = Path.Combine( - Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location)!, + AppContext.BaseDirectory, "ic.mp4" );