diff --git a/build/darwin/Contents/Resources/Scripts/main.applescript b/build/darwin/Contents/Resources/Scripts/main.applescript deleted file mode 100644 index 10fb41b041..0000000000 --- a/build/darwin/Contents/Resources/Scripts/main.applescript +++ /dev/null @@ -1,14 +0,0 @@ -on open location input - set dirname to POSIX path of (path to me) - set binary to dirname & "/Contents/MacOS/bin/spicetify" - do shell script binary & " protocol " & quoted form of input -end open location - -on run - set dirname to POSIX path of (path to me) - set binary to dirname & "/Contents/MacOS/bin/spicetify" - tell application "Terminal" - activate - do script binary - end tell -end run diff --git a/build/darwin/Contents/Resources/Scripts/main.scpt b/build/darwin/Contents/Resources/Scripts/main.scpt index ef8b322d68..4a2ae353f8 100644 Binary files a/build/darwin/Contents/Resources/Scripts/main.scpt and b/build/darwin/Contents/Resources/Scripts/main.scpt differ diff --git a/build/darwin/Contents/Resources/Scripts/main.scpt.old b/build/darwin/Contents/Resources/Scripts/main.scpt.old deleted file mode 100644 index 4a2ae353f8..0000000000 Binary files a/build/darwin/Contents/Resources/Scripts/main.scpt.old and /dev/null differ diff --git a/module/module.go b/module/module.go index d4802843d6..ed5fe400f0 100644 --- a/module/module.go +++ b/module/module.go @@ -175,10 +175,12 @@ func EnableModuleInVault(identifier StoreIdentifier) error { module.Enabled = identifier.Version vault.setModule(identifier.ModuleIdentifier, module) - destroySymlink(identifier.ModuleIdentifier) - if len(module.Enabled) > 0 { - if err := createSymlink(identifier); err != nil { - return err + if len(string(identifier.ModuleIdentifier)) > 0 { + destroySymlink(identifier.ModuleIdentifier) + if len(string(module.Enabled)) > 0 { + if err := createSymlink(identifier); err != nil { + return err + } } } diff --git a/module/vault.go b/module/vault.go index 55103638d7..009b6e3738 100644 --- a/module/vault.go +++ b/module/vault.go @@ -114,7 +114,7 @@ type StoreIdentifier struct { Version } -var storeIdentifierRe = regexp.MustCompile(`^(?[^@]+)@(?[^@]*)$`) +var storeIdentifierRe = regexp.MustCompile(`^(?[^@]*)@(?[^@]*)$`) func NewStoreIdentifier(identifier string) StoreIdentifier { parts := storeIdentifierRe.FindStringSubmatch(identifier)