diff --git a/README.md b/README.md index 387a4e6..6410d36 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ Available as a [LuaRocks 3][luarocks] [package][package]. ## Features love-release makes your LÖVE game release easier. love-release can -create from your sources: Windows executables, MacOS X applications, +create from your sources: Windows executables, macOS applications, Debian packages, and simple LÖVE files. love-release creates only one LÖVE file per release directory and @@ -41,7 +41,7 @@ Arguments: Options: -D Debian package. - -M MacOS X application. + -M macOS application. -W [32|64] Windows executable. -a , --author Author full name. Required for Debian. diff --git a/rockspecs/love-release-scm-3.rockspec b/rockspecs/love-release-scm-4.rockspec similarity index 93% rename from rockspecs/love-release-scm-3.rockspec rename to rockspecs/love-release-scm-4.rockspec index 7912889..f2884ab 100644 --- a/rockspecs/love-release-scm-3.rockspec +++ b/rockspecs/love-release-scm-4.rockspec @@ -1,5 +1,5 @@ package = "love-release" -version = "scm-3" +version = "scm-4" rockspec_format = "3.0" source = { url = "git://github.com/MisterDA/love-release.git", @@ -26,7 +26,7 @@ build = { modules = { ["love-release.scripts.debian"] = "src/scripts/debian.lua", ["love-release.scripts.love"] = "src/scripts/love.lua", - ["love-release.scripts.macosx"] = "src/scripts/macosx.lua", + ["love-release.scripts.macos"] = "src/scripts/macos.lua", ["love-release.scripts.windows"] = "src/scripts/windows.lua", ["love-release.pipes.args"] = "src/pipes/args.lua", ["love-release.pipes.conf"] = "src/pipes/conf.lua", diff --git a/src/pipes/args.lua b/src/pipes/args.lua index c417fd2..2e5f967 100644 --- a/src/pipes/args.lua +++ b/src/pipes/args.lua @@ -29,8 +29,8 @@ function Args:initialize() parser:flag("-D", "Debian package.") :target "debian" - parser:flag("-M", "MacOS X application.") - :target "macosx" + parser:flag("-M", "macOS application.") + :target "macos" parser:option("-W", "Windows executable.") :target "windows" :args "0-1" @@ -93,8 +93,8 @@ function Args:__call(project) local script script = require 'love-release.scripts.love' script(project) - if args.macosx then - script = require 'love-release.scripts.macosx' + if args.macos then + script = require 'love-release.scripts.macos' script(project) end if #args.windows > 0 then diff --git a/src/scripts/macosx.lua b/src/scripts/macos.lua similarity index 92% rename from src/scripts/macosx.lua rename to src/scripts/macos.lua index 89e755c..c7abd3d 100644 --- a/src/scripts/macosx.lua +++ b/src/scripts/macos.lua @@ -1,6 +1,6 @@ ---- MacOS X app release. --- @module scripts.macosx --- @usage macosx(project) +--- macOS app release. +-- @module scripts.macos +-- @usage macos(project) local fs = require "luarocks.fs" local zip = require "brimworks.zip" @@ -14,7 +14,7 @@ local s = {} local function validate(project) local valid, err = true, utils.io.err if type(project.identifier) ~= "string" or project.identifier == "" then - err("MacOS X: No identifier specified.\n") + err("macOS: No identifier specified.\n") valid = false end if not valid then os.exit(1) end @@ -31,7 +31,7 @@ function s.script(project) if project.loveVersion >= ver'11.0' then bin = prefix..".zip" elseif project.loveVersion == ver'0.10.0' then - utils.io.err("MacOS X: No LÖVE 0.10.0 binary available.\n") + utils.io.err("macOS: No LÖVE 0.10.0 binary available.\n") os.exit(1) elseif project.loveVersion >= ver'0.9.0' then bin = prefix.."x-x64.zip"