Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix installer to look for kext in correct location #13677

Merged
merged 1 commit into from Sep 11, 2018
Merged

fix installer to look for kext in correct location #13677

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions osx/Installer/Info.plist
View file
Open in desktop
Expand Up @@ -15,11 +15,11 @@
<key>CFBundlePackageType</key>
<string>APPL</string>
<key>CFBundleShortVersionString</key>
<string>1.1.63</string>
<string>1.1.64</string>
<key>CFBundleSignature</key>
<string>KEYB</string>
<key>CFBundleVersion</key>
<string>1.1.63</string>
<string>1.1.64</string>
<key>KBFuseBuild</key>
<string>3.8.2</string>
<key>KBFuseVersion</key>
Expand Down
4 changes: 3 additions & 1 deletion osx/KBKit/KBKit/Component/KBFuseComponent.m
View file
Open in desktop
Expand Up @@ -266,7 +266,9 @@ - (NSString *)kextID {
}

- (NSString *)kextPath {
return @"/Library/Filesystems/kbfuse.fs/Contents/Extensions/10.10/kbfuse.kext";
NSProcessInfo *pInfo = [NSProcessInfo processInfo];
NSOperatingSystemVersion version = [pInfo operatingSystemVersion];
return [NSString stringWithFormat:@"/Library/Filesystems/kbfuse.fs/Contents/Extensions/%ld.%ld/kbfuse.kext", version.majorVersion, version.minorVersion];
}

@end
2 changes: 1 addition & 1 deletion packaging/desktop/kbfuse.sh
View file
Open in desktop
Expand Up @@ -15,7 +15,7 @@ cd $dir
client_dir="$dir/../.."
fuse_dir="$client_dir/osx/Fuse"
tmp_dir="/tmp/desktop-kbfuse"
installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.63-darwin.tgz"
installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.64-darwin.tgz"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this something we'll have to update all the time?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only when we change the installer or upgrade kbfuse, I think. In this case the fix is in the installer, and 1.1.63 is already in admin build, so it'd need be bump.


if [ "$EUID" -ne 0 ]; then
echo "Please run as root"
Expand Down
2 changes: 1 addition & 1 deletion packaging/desktop/package_darwin.sh
View file
Open in desktop
Expand Up @@ -97,7 +97,7 @@ shared_support_dir="$out_dir/Keybase.app/Contents/SharedSupport"
resources_dir="$out_dir/Keybase.app/Contents/Resources/"

# The KeybaseInstaller.app installs KBFuse, keybase.Helper, services and CLI via a native app
installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.63-darwin.tgz"
installer_url="https://prerelease.keybase.io/darwin-package/KeybaseInstaller-1.1.64-darwin.tgz"
# KeybaseUpdater.app is the native updater UI (prompt dialogs)
updater_url="https://prerelease.keybase.io/darwin-package/KeybaseUpdater-1.0.6-darwin.tgz"

Expand Down