Skip to content

Commit 59aeb12

Browse files
committed
fix dist output path
1 parent 0dbea8d commit 59aeb12

3 files changed

Lines changed: 4 additions & 4 deletions

File tree

dist/server.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ extension_map = "extmap.conf" ; Netatalk compatible extension mapping file
4747
; AFP Volume Configuration. Each volume must have a section for this.
4848
[Volumes.Default]
4949
name = "Welcome" ; Volume Name. Max Length of 31 characters.
50-
path = "./dist/Sample Volume" ; Host path for the volume. Eg "/media/Mac", "C:\Foo"
50+
path = "./Sample Volume" ; Host path for the volume. Eg "/media/Mac", "C:\Foo"
5151
read_only = true ; When true, the volume will be advertised as read-only and write operations will be rejected. Default is false.
5252
rebuild_desktop_db = true ; When true, rebuilds the desktop database from resource forks. Default is false.
5353

scripts/ci/package-release.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ $archiveName = "omnitalk-$releaseTag-windows-amd64.zip"
77
New-Item -ItemType Directory -Path $stage -Force | Out-Null
88
Copy-Item out/omnitalk.exe "$stage/omnitalk.exe"
99
Copy-Item README.md,server.ini.example,extmap.conf $stage
10-
Copy-Item dist "$stage/dist" -Recurse
10+
Get-ChildItem -Path dist -Force | Copy-Item -Destination $stage -Recurse -Force
1111
Compress-Archive -Path $stage -DestinationPath $archiveName -Force
1212

1313
$archiveName

scripts/ci/package-release.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ if [[ "$target_os" == "linux" ]]; then
1717
mkdir -p "$stage"
1818
cp out/omnitalk "$stage/"
1919
cp README.md server.ini.example extmap.conf "$stage/"
20-
cp -r dist "$stage/dist"
20+
cp -a dist/. "$stage/"
2121
tar -C release -czf "$archive_name" "$(basename "$stage")"
2222
echo "$archive_name"
2323
exit 0
@@ -52,7 +52,7 @@ if [[ "$target_os" == "macos" ]]; then
5252
EOF
5353

5454
cp README.md server.ini.example extmap.conf "$stage/"
55-
cp -r dist "$stage/dist"
55+
cp -a dist/. "$stage/"
5656
(cd release && zip -r "../$archive_name" "$(basename "$stage")")
5757
echo "$archive_name"
5858
exit 0

0 commit comments

Comments
 (0)