Skip to content

Commit 14c0b7c

Browse files
committed
Update readme
1 parent c69af25 commit 14c0b7c

3 files changed

Lines changed: 22 additions & 28 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ add_subdirectory(src)
164164
if (WOWPKG_ENABLE_TESTS)
165165
message(STATUS "[${PROJECT_NAME}] enabling tests")
166166
add_subdirectory(tests)
167+
endif()
167168

168-
if (WOWPKG_ENABLE_TESTS_INTEGRATION)
169-
message(STATUS "[${PROJECT_NAME}] enabling integration tests")
170-
add_subdirectory(tests/integration)
171-
endif()
169+
if (WOWPKG_ENABLE_TESTS_INTEGRATION)
170+
message(STATUS "[${PROJECT_NAME}] enabling integration tests")
171+
add_subdirectory(tests/integration)
172172
endif()
173173

174174
if (APPLE)

README.md

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ wowpkg upgrade [ADDON...]
2222

2323
ADDON for the following commands is the name of an addon. The name will include no spaces and is case-insensitive. It otherwise should match exactly the addon name found in the catalog.
2424

25-
Gets information for one or more addons. Things like name, description, installed status, and url used.
25+
Gets information for one or more addons. Things like name, description, installed status, and URI used.
2626

2727
```
2828
wowpkg info ADDON...
@@ -52,9 +52,7 @@ Remove/uninstall the given addons.
5252
wowpkg remove ADDON...
5353
```
5454

55-
Searches the catalog for any addons that match TEXT.
56-
57-
Currently, only the addon names are searched.
55+
Searches the catalog for any addons that match TEXT. Searches the name and description of the items in the catalog.
5856

5957
```
6058
wowpkg search TEXT
@@ -99,10 +97,10 @@ Add the new addon to the catalog by:
9997

10098
### Windows
10199

102-
1. Run "wowpkg-VERSION-win64.exe" from the latest release.
103-
2. Create a wowpkg directory in the %APPDATA% directory.
104-
3. Copy [config.ini](data/config.ini) to %APPDATA%\wowpkg and update the addons path to the path of your World of Warcraft AddOns directory.
105-
4. Assuming wowpkg was installed in the default location. Add C:\Program Files\wowpkg\bin to the user PATH environment variable. This makes it easy to run wowpkg from anywhere in the terminal.
100+
1. Run `wowpkg-VERSION-win64.exe` from the latest release.
101+
2. Create a wowpkg directory in the `%APPDATA%` directory.
102+
3. Copy [config.ini](data/config.ini) to `%APPDATA%\wowpkg` and update the addons path to the path of your World of Warcraft AddOns directory.
103+
4. Assuming wowpkg was installed in the default location. Add `C:\Program Files\wowpkg\bin` to the user PATH environment variable. This makes it easy to run wowpkg from anywhere in the terminal.
106104

107105
### macOS
108106

@@ -121,15 +119,15 @@ The below should work on Apple silicon. I have not been able to test on an Intel
121119

122120
### Windows
123121

124-
1. Run `Uninstall.exe` from the installed wowpkg directory.
125-
2. Remove wowpkg\bin from your user PATH.
126-
3. If you want to remove user config data, remove the %APPDATA%\wowpkg directory.
122+
1. Run `Uninstall.exe` from the installed wowpkg directory (default `C:\Program Files\wowpkg\bin`).
123+
2. Remove `wowpkg\bin` from your user PATH.
124+
3. If you want to remove user config data, remove the `%APPDATA%\wowpkg` directory.
127125

128126
### macOS
129127

130-
1. Remove the /Applications/wowpkg directory.
131-
2. Remove the export path from ~/.zshrc or terminal equivalent.
132-
3. If you want to remove user config data, remove the ~/.config/wowpkg directory.
128+
1. Remove the `/Applications/wowpkg` directory.
129+
2. Remove the export path from `~/.zshrc` or terminal equivalent.
130+
3. If you want to remove user config data, remove the `~/.config/wowpkg` directory.
133131

134132
## Running from source
135133

@@ -140,8 +138,8 @@ There are a couple of project-specific CMake options to pass in that can change
140138
| --- | --- | --- |
141139
| WOWPKG_ENABLE_SANITIZERS | OFF | Builds the program with or without sanitizers. |
142140
| WOWPKG_ENABLE_TESTS | OFF | Determines whether or not tests will be built. |
143-
| WOWPKG_ENABLE_TESTS_INTEGRATION | OFF | Determines whether or not integration tests will be built. |
144-
| WOWPKG_USE_DEVELOPMENT_PATHS | OFF | When enabled, the path to config.ini and location are saved. wowpkg will be set to the [data](data) project directory. When disabled, the paths to config.ini are saved. wowpkg will be dependent on the current OS. %APPDATA%/wowpkg for Windows and ~/.config/wowpkg for macOS/Linux. Generally, use development paths unless the project is being built for packaging or release. |
141+
| WOWPKG_ENABLE_TESTS_INTEGRATION | OFF | Determines whether or not integration tests will be built. These tests can take a significant amount of time to run. |
142+
| WOWPKG_USE_DEVELOPMENT_PATHS | OFF | When enabled, the path to `config.ini` and `saved.wowpkg` will be set to the [data](data) project directory. When disabled, the paths to `config.ini` and `saved.wowpkg` will be dependent on the current OS. `%APPDATA%/wowpkg` for Windows and `~/.config/wowpkg` for macOS/Linux. Generally, use development paths unless the project is being built for packaging or release. |
145143

146144
1. Clone the repo.
147145
```
@@ -153,16 +151,12 @@ There are a couple of project-specific CMake options to pass in that can change
153151
git clone https://github.com/microsoft/vcpkg.git
154152
```
155153
3. Run vcpkg bootstrap with `./vcpkg/bootstrap-vcpkg.sh` or `./vcpkg/bootstrap-vcpkg.bat` depending on your system.
156-
4. Install dependencies with vcpkg.
157-
```
158-
./vcpkg/vcpkg install
159-
```
160-
5. Create a build directory and compile.
154+
4. Create a build directory and compile. vcpkg should download and build all dependencies found in [vcpkg.json](vcpkg.json).
161155
```
162156
$ mkdir build
163157
$ cd build
164158
$ cmake .. -DWOWPKG_USE_DEVELOPMENT_PATHS:option=on
165159
$ cmake --build .
166160
```
167-
6. Change the path in [config.ini](data/config.ini) to where you want the addons to be extracted. Something like `/path/to/wowpkg/data/addons`.
168-
7. Run the compiled program.
161+
5. Change the path in [config.ini](data/config.ini) to where you want the addons to be extracted. Something like `/path/to/wowpkg/data/addons`.
162+
6. Run the compiled program.

vcpkg.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wowpkg",
3-
"version": "0.3.3",
3+
"version": "0.4.0",
44
"dependencies": [
55
"cjson",
66
"curl",

0 commit comments

Comments
 (0)