Skip to content

Commit

Permalink
Merge branch 'master' into beta-4.50.6
Browse files Browse the repository at this point in the history
  • Loading branch information
bwp91 committed Sep 18, 2023
2 parents 8bda53b + f585962 commit 320875a
Show file tree
Hide file tree
Showing 10 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ npm run test

Additional language translations, or improvements to existing translations are most welcome. Translations can be found here:

https://github.com/oznu/homebridge-config-ui-x/tree/master/ui/src/i18n
https://github.com/homebridge/homebridge-config-ui-x/tree/master/ui/src/i18n
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -140,4 +140,4 @@ Join the [Official Homebridge Discord](https://discord.gg/C87Pvq3) community and

# Credit

Homebridge Config UiI X was originally created by [Oznu](https://github.com/oznu).
Homebridge Config UI X was originally created by [oznu](https://github.com/oznu).
2 changes: 1 addition & 1 deletion src/bin/platforms/win32.ts
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ export class Win32Installer extends BasePlatform {
* This is used to create the Windows Services
*/
private async downloadNssm(): Promise<string> {
const downloadUrl = `https://github.com/oznu/nssm/releases/download/2.24-101-g897c7ad/nssm_${os.arch()}.exe`;
const downloadUrl = `https://github.com/homebridge/nssm/releases/download/2.24-101-g897c7ad/nssm_${os.arch()}.exe`;
const nssmPath = path.resolve(this.hbService.storagePath, 'nssm.exe');

if (await fs.pathExists(nssmPath)) {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/log/log.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ export class LogService {
client.emit('stdout', '\n\r');
client.emit('stdout', color.red(`The log tail command "${command.join(' ')}" exited with code ${code.exitCode}.\n\r`));
client.emit('stdout', color.red('Please check the command in your config.json is correct.\n\r\n\r'));
client.emit('stdout', color.cyan('See https://github.com/oznu/homebridge-config-ui-x#log-viewer-configuration for instructions.\r\n'));
client.emit('stdout', color.cyan('See https://github.com/homebridge/homebridge-config-ui-x/wiki/Manual-Configuration#log-viewer-configuration for instructions.\r\n'));
}
} catch (e) {
// the client socket probably closed
Expand Down
4 changes: 2 additions & 2 deletions src/modules/plugins/plugins.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -646,7 +646,7 @@ export class PluginsService {
pluginAction.version !== 'latest'
) {
try {
await this.httpService.head(`https://github.com/oznu/homebridge-config-ui-x/releases/download/${pluginAction.version}/homebridge-config-ui-x-${pluginAction.version}.tar.gz`).toPromise();
await this.httpService.head(`https://github.com/homebridge/homebridge-config-ui-x/releases/download/${pluginAction.version}/homebridge-config-ui-x-${pluginAction.version}.tar.gz`).toPromise();
return true;
} catch (e) {
return false;
Expand Down Expand Up @@ -1252,7 +1252,7 @@ export class PluginsService {
client.emit('stdout', `${path.resolve(cwd, 'node_modules')}\n\r\n\r`);
client.emit('stdout', color.yellow('This may cause the operation to fail.\n\r'));
client.emit('stdout', color.yellow('See the docs for details on how to enable sudo mode:\n\r'));
client.emit('stdout', color.yellow('https://github.com/oznu/homebridge-config-ui-x#sudo-mode\n\r\n\r'));
client.emit('stdout', color.yellow('https://github.com/homebridge/homebridge-config-ui-x/wiki/Manual-Configuration#sudo-mode\n\r\n\r'));
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ <h5 class="modal-title">Homebridge Google Smart Home</h5>
<p class="mb-0">
<span [translate]="'accessories.message_please_see'">Please see</span>
<a target="_blank" rel="noopener noreferrer"
href="https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
href="https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
</a>
<span [translate]="'accessories.message_for_more_information'">for more information.</span>
</p>
Expand Down
4 changes: 2 additions & 2 deletions ui/src/app/modules/accessories/accessories.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ <h3 class="primary-text" [translate]="'accessories.title_accessory_control_disab
<p>
<span [translate]="'accessories.message_please_see'">Please see</span>
<a target="_blank" rel="noopener noreferrer"
href="https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
https://github.com/oznu/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
href="https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control">
https://github.com/homebridge/homebridge-config-ui-x/wiki/Enabling-Accessory-Control
</a>
<span [translate]="'accessories.message_for_more_information'">for more information.</span>
</p>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
<div class="modal-footer">
<div class="w-100 text-right">
<p class="small mb-0">
<a class="font-italic" href="https://github.com/oznu/homebridge-config-ui-x/wiki/Developers:-Donation-Links"
<a class="font-italic" href="https://github.com/homebridge/homebridge-config-ui-x/wiki/Developers:-Donation-Links"
target="_blank" rel="noopener noreferrer" translate="plugins.donate.message_learn_more">
</a>
</p>
Expand Down
2 changes: 1 addition & 1 deletion ui/src/app/modules/status/status.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
<div class="col-md-12 text-center mb-3 grey-text">
<small>
<a class="grey-text" target="_blank" rel="noopener noreferrer"
href="https://github.com/oznu/homebridge-config-ui-x">{{ $settings.env.packageName }}
href="https://github.com/homebridge/homebridge-config-ui-x">{{ $settings.env.packageName }}
v{{ $settings.env.packageVersion }}</a>
-
</small>
Expand Down
4 changes: 2 additions & 2 deletions upgrade-install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,15 +28,15 @@ fi

echo "Downloading SHASUMS256.txt..."
curl -fsSL# -o "$tmp_dir/SHASUMS256.txt" \
https://github.com/oznu/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/SHASUMS256.txt
https://github.com/homebridge/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/SHASUMS256.txt
if [ "$?" != "0" ]; then
echo "Failed to download SHASUMS256.txt"
exit 1
fi

echo "Downloading homebridge-config-ui-x-${TARGET_VERSION}.tar.gz..."
curl -fL# -o "$tmp_dir/homebridge-config-ui-x-${TARGET_VERSION}.tar.gz" \
https://github.com/oznu/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/homebridge-config-ui-x-${TARGET_VERSION}.tar.gz
https://github.com/homebridge/homebridge-config-ui-x/releases/download/${TARGET_VERSION}/homebridge-config-ui-x-${TARGET_VERSION}.tar.gz
if [ "$?" != "0" ]; then
echo "Failed to download homebridge-config-ui-x-${TARGET_VERSION}.tar.gz"
exit 1
Expand Down

0 comments on commit 320875a

Please sign in to comment.