Skip to content

Commit

Permalink
Move /etc/ish-version to /ish/version, /ios/apk to /ish/apk
Browse files Browse the repository at this point in the history
  • Loading branch information
tbodt committed Nov 29, 2020
1 parent 28a7db9 commit e8d7d7e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
7 changes: 3 additions & 4 deletions app/AppDelegate.m
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ - (int)boot {

// /etc/ish-version is the last ish version that opened this root. Not used for anything yet, but could be used to know whether to change the root if needed in a future update.
BOOL has_ish_version = NO;
struct fd *ish_version = generic_open("/etc/ish-version", O_WRONLY_|O_TRUNC_, 0644);
struct fd *ish_version = generic_open("/ish/version", O_WRONLY_|O_TRUNC_, 0644);
if (!IS_ERR(ish_version)) {
has_ish_version = YES;
NSString *version = NSBundle.mainBundle.infoDictionary[(__bridge NSString *) kCFBundleVersionKey];
Expand All @@ -86,9 +86,8 @@ - (int)boot {

if (has_ish_version && [NSBundle.mainBundle URLForResource:@"OnDemandResources" withExtension:@"plist"] != nil) {
fs_register(&apkfs);
generic_mkdirat(AT_PWD, "/ios", 0755);
generic_mkdirat(AT_PWD, "/ios/apk", 0755);
do_mount(&apkfs, "apk", "/ios/apk", "", 0);
generic_mkdirat(AT_PWD, "/ish/apk", 0755);
do_mount(&apkfs, "apk", "/ish/apk", "", 0);
}

// create some device nodes
Expand Down
4 changes: 2 additions & 2 deletions iSH.xcconfig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ ISH_LOGGER_macosx = dprintf

ENABLE_APK_ODRS = NO
ROOTFS_URL = $(ROOTFS_URL_IF_ODRS_$(ENABLE_APK_ODRS))
ROOTFS_URL_IF_ODRS_YES = github.com/ish-app/roots/releases/download/gd12a2d01040f909622203bddb1ace9f7c204ab65/appstore-apk.tar.gz
ROOTFS_URL_IF_ODRS_NO = github.com/ish-app/roots/releases/download/gd12a2d01040f909622203bddb1ace9f7c204ab65/appstore.tar.gz
ROOTFS_URL_IF_ODRS_YES = github.com/ish-app/roots/releases/download/g31251b2000a4378e65839b357dfc4dbf28a9dfb5/appstore-apk.tar.gz
ROOTFS_URL_IF_ODRS_NO = github.com/ish-app/roots/releases/download/g31251b2000a4378e65839b357dfc4dbf28a9dfb5/appstore.tar.gz

PRODUCT_APP_GROUP_IDENTIFIER = group.$(ROOT_BUNDLE_IDENTIFIER)

0 comments on commit e8d7d7e

Please sign in to comment.