Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
  • Loading branch information
ls- committed Jun 4, 2024
2 parents 64e4628 + 8120954 commit 314450a
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 4 deletions.
10 changes: 9 additions & 1 deletion .compressor.ps1
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
Set-Location $PSScriptRoot

if (-Not (Test-Path "$env:ProgramFiles\7-Zip\7z.exe")) {
Write-Host "7z.exe not found"

return Read-Host
}

Set-Alias 7z "$env:ProgramFiles\7-Zip\7z.exe"

$name = (Get-Item .).Name

if (-Not (Test-Path (".\" + $name + "\" + $name + ".toc"))) {
Expand Down Expand Up @@ -39,5 +47,5 @@ if (Test-Path $temp) {

New-Item -Path $temp -ItemType Directory | Out-Null
Copy-Item $foldersToInclude -Destination $temp -Exclude $filesToExclude -Recurse
Get-ChildItem $temp | Compress-Archive -DestinationPath "..\$name-$version.zip" -Force
7z a -tzip -mx9 "..\$name-$version.zip" (Get-ChildItem $temp)
Remove-Item $temp -Recurse -Force
6 changes: 5 additions & 1 deletion .currency_build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,11 @@ $categoriesToBlacklist = @(
246, # Debug
248, # Torghast UI (Hidden)
251, # Dragon Racing UI (Hidden)
252 # Tuskarr - Fishing Nets (Hidden)
252, # Tuskarr - Fishing Nets (Hidden)
253, # Test Subcategory 1
254, # Test Subcategory 2
255, # Test Subcategory 3
256 # Test Subcategory 4
)

# convert IDs to int because sorting strings sucks ass
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## Version 100207.02

- Fixed an issue where the archive wouldn't extract properly for Mac and Linux users.

## Version 100207.01

- Added 10.2.7 support.
Expand Down
2 changes: 1 addition & 1 deletion ls_Toasts/core/changelog.lua
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ local _G = getfenv(0)

-- Mine
E.CHANGELOG = [[
- Added 10.2.7 support.
- Fixed an issue where the archive wouldn't extract properly for Mac and Linux users.
]]
2 changes: 1 addition & 1 deletion ls_Toasts/ls_Toasts.toc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Interface: 100207
## Author: lightspark
## Version: 100207.01
## Version: 100207.02
## Title: LS: |cff00cc99Toasts|r
## Notes: Better toasts, cheers!
## IconTexture: Interface\AddOns\ls_Toasts\assets\logo-64
Expand Down

0 comments on commit 314450a

Please sign in to comment.