From 9050015e7807a1dd445e19a6e2537b0269a29ff0 Mon Sep 17 00:00:00 2001 From: "Jay Freeman (saurik)" Date: Tue, 5 May 2009 05:44:41 +0000 Subject: [PATCH] Various awesome upgrades. --- Cydia.app/Cydia | 5 +- Cydia.app/English.lproj/Localizable.strings | 1 + .../Modes/{Downgrade.png => DOWNGRADE.png} | Bin Cydia.app/Modes/{Install.png => INSTALL.png} | Bin Cydia.app/Modes/NEW_INSTALL.png | 1 + Cydia.app/Modes/New Install.png | 1 - Cydia.app/Modes/{Purge.png => PURGE.png} | Bin .../Modes/{Reinstall.png => REINSTALL.png} | Bin Cydia.app/Modes/{Remove.png => REMOVE.png} | Bin Cydia.app/Modes/{Upgrade.png => UPGRADE.png} | Bin Cydia.app/Sources/apt.bigboss.us.com.png | Bin 6405 -> 0 bytes Cydia.app/Sources/apt.modmyi.com.png | Bin 5186 -> 0 bytes Cydia.app/Sources/apt.saurik.com.png | Bin 1952 -> 0 bytes Cydia.app/Sources/repo.smxy.org.png | Bin 737 -> 0 bytes Cydia.mm | 156 +++++++++++------- Library/free.sh | 1 + Library/move.sh | 2 +- UICaboodle/BrowserView.m | 3 +- control | 4 +- make.sh | 2 +- 20 files changed, 111 insertions(+), 65 deletions(-) rename Cydia.app/Modes/{Downgrade.png => DOWNGRADE.png} (100%) rename Cydia.app/Modes/{Install.png => INSTALL.png} (100%) create mode 120000 Cydia.app/Modes/NEW_INSTALL.png delete mode 120000 Cydia.app/Modes/New Install.png rename Cydia.app/Modes/{Purge.png => PURGE.png} (100%) rename Cydia.app/Modes/{Reinstall.png => REINSTALL.png} (100%) rename Cydia.app/Modes/{Remove.png => REMOVE.png} (100%) rename Cydia.app/Modes/{Upgrade.png => UPGRADE.png} (100%) delete mode 100644 Cydia.app/Sources/apt.bigboss.us.com.png delete mode 100644 Cydia.app/Sources/apt.modmyi.com.png delete mode 100644 Cydia.app/Sources/apt.saurik.com.png delete mode 100644 Cydia.app/Sources/repo.smxy.org.png diff --git a/Cydia.app/Cydia b/Cydia.app/Cydia index 8356734e..3c723156 100755 --- a/Cydia.app/Cydia +++ b/Cydia.app/Cydia @@ -1,5 +1,6 @@ #!/bin/bash -Cydia=$(dirname "$0") +C=/${0} +C=${C%/*} declare -a flags [[ :${DYLD_INSERT_LIBRARIES}: == */MobileSubstrate.dylib: ]] && flags[${#flags[@]}]=--substrate -exec "${Cydia}"/Cydia_ "${flags[@]}" -- "$@" 2>>/tmp/cydia.log +exec "${C:-.}"/Cydia_ "${flags[@]}" -- "$@" 2>>/tmp/cydia.log diff --git a/Cydia.app/English.lproj/Localizable.strings b/Cydia.app/English.lproj/Localizable.strings index 01b1a77c..3ccfa62f 100644 --- a/Cydia.app/English.lproj/Localizable.strings +++ b/Cydia.app/English.lproj/Localizable.strings @@ -95,6 +95,7 @@ "LOGIN" = "Login"; "MAINTAINER" = "Contact"; "MANAGE" = "Manage"; +"MODIFICATIONS" = "Modifications"; "MODIFY" = "Modify"; "MORE_INFORMATION" = "More Information"; "MORE_PACKAGE_SOURCES" = "More Package Sources"; diff --git a/Cydia.app/Modes/Downgrade.png b/Cydia.app/Modes/DOWNGRADE.png similarity index 100% rename from Cydia.app/Modes/Downgrade.png rename to Cydia.app/Modes/DOWNGRADE.png diff --git a/Cydia.app/Modes/Install.png b/Cydia.app/Modes/INSTALL.png similarity index 100% rename from Cydia.app/Modes/Install.png rename to Cydia.app/Modes/INSTALL.png diff --git a/Cydia.app/Modes/NEW_INSTALL.png b/Cydia.app/Modes/NEW_INSTALL.png new file mode 120000 index 00000000..475bda66 --- /dev/null +++ b/Cydia.app/Modes/NEW_INSTALL.png @@ -0,0 +1 @@ +INSTALL.png \ No newline at end of file diff --git a/Cydia.app/Modes/New Install.png b/Cydia.app/Modes/New Install.png deleted file mode 120000 index 3330a1bb..00000000 --- a/Cydia.app/Modes/New Install.png +++ /dev/null @@ -1 +0,0 @@ -Install.png \ No newline at end of file diff --git a/Cydia.app/Modes/Purge.png b/Cydia.app/Modes/PURGE.png similarity index 100% rename from Cydia.app/Modes/Purge.png rename to Cydia.app/Modes/PURGE.png diff --git a/Cydia.app/Modes/Reinstall.png b/Cydia.app/Modes/REINSTALL.png similarity index 100% rename from Cydia.app/Modes/Reinstall.png rename to Cydia.app/Modes/REINSTALL.png diff --git a/Cydia.app/Modes/Remove.png b/Cydia.app/Modes/REMOVE.png similarity index 100% rename from Cydia.app/Modes/Remove.png rename to Cydia.app/Modes/REMOVE.png diff --git a/Cydia.app/Modes/Upgrade.png b/Cydia.app/Modes/UPGRADE.png similarity index 100% rename from Cydia.app/Modes/Upgrade.png rename to Cydia.app/Modes/UPGRADE.png diff --git a/Cydia.app/Sources/apt.bigboss.us.com.png b/Cydia.app/Sources/apt.bigboss.us.com.png deleted file mode 100644 index 8c79a38db9706aea63976571ce3fc9371ded7fff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6405 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 TcQl4m00000NkvXXu0mjfA~hBp diff --git a/Cydia.app/Sources/apt.modmyi.com.png b/Cydia.app/Sources/apt.modmyi.com.png deleted file mode 100644 index 18885ea9a4cdc80ebc42e20fb3a546bbf40ad267..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5186 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 diff --git a/Cydia.app/Sources/apt.saurik.com.png b/Cydia.app/Sources/apt.saurik.com.png deleted file mode 100644 index f2bfcab3cf1701b8c0d25dfa57b7ea6e23ee8947..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1952 zcmV;R2VeM!P)Px+T1iAfR9M5smu;wJRT;;B&$C|kKIhzf=iV7-6ip!##Y6(L5)rIGVQQiwg8a~j z4D(A=G!;rOph1L*jNylrtU>c7QV2}VBFZu{(o6}GsZ7j9n`yi=_nv$1IeV{{rw>;} z9n80^^=0n`Yw!PWJT!Z_~%ZzaJjns zjz917`M(0N`|>Zk&GSp=`EGni+wIf&*s*zGiA{q!7Dpo%0)(bTG-CpYtS916CuWyV z^7{S9pZn$Vnp1GojW_7l#iP!%^@Drr%46!%m^tkjsnKX9h~WGHd;@-f#33}Jp^stb zLa^JHV*J?Oetc8kJmxoskFgLethbH-MnjG31`za$jS@4yCDgzIr5C|yh8q941 zzX)LnVFb+_66cXP8VuX!;^T&+PagWoH{=xq-1W;}pVsDdrA?PdZ7vLC%CMPZ)HKY; zNUK5&1Eh(Vf+#>moCgiy0)&8s7Ku@ZgYa4Lqj$U_fM4AEz+hXP|B9_FpXj2o6(BORl3Xl-*F{gmXBy0$aBHCc;Kn45&AM{;AuOIo309Rdm zjm*dPb9CziO=|?3GStk1CK-B<(?AF|)@#yA0->PXA>)qM}TXEpt^FSq>g`>m6*-SPzO4$?5e`Hmn)8(V@3UIk?e zNiYXO0m)D*NQ-F&^N1;CdE=Sa5PHO(nX7TelYe}00Ia#P5SeoX5! z8b`R2a4sWtLrm0w9xDNpgyux8Ye?LJNI)iQm~*IlOg&P2s2zyMO2X&$urOXfG6GxY zhi#rL57lN+Cs-a+@)U0~L@Vk7lE;`D;v&L2wHB(4FkhiRgqVXcL{bF>D+VJx=O8wpM>cFN?yZB!Kp{fnA#VrwNyGJ4w2d*r69FJ^_WhP z60x)bRiX5#glEo$fa0*!K{u0rmhFfL>_4zK587cz8dJ*}t`^i1sZQ~>MiP&69+wJI zr{Dr69?~i{8zD`Dxm9ol@k6kNYKr6;B7tfG{S52615O7|9073X@bdVCV@7|VPp8!` zp=C<0iCTILL1c#71gT1F8ia(0f*~EKjGG(f4O*zjjh6Q;KF9sW=1mnW`Pu71}1ybz_1EK^?8{$+^R+;#8@586<&g znUu)5=dt}EeDlS6M*uwC`NxO7zrgo?PhZ_hRx=tZrh-im(A7fc1Fa>zdV&-Nw#HNn z&Se_cZdgstR4G&uR_bWqKgwv=doKRL-dAi&cYo@foxUGm7yFgXtt4rsqE^5vtp=o7 zq-lpNbWh>b5Go-kP6a_x6_Q1pu=wPDwqEqRynOf9cHdWDHUiJKC;Y;lOVe&w?Bf-o zrftz|!-Q60#S*No;08it13ZSyQ+#lkILibxM<;P`Qyqle_pju=S6p|b_{-Yz3qE?b zZn5roO;3L{%<@hzXiJb^c>JkFF691lDyywdA+;!j$D^Ab7@N}6!Afb&G m%zX5NX8OGw@14D#^8DWyC4j<{ZZI7H0000Px%n@L1LR9M69mOF10F%*Tr)h0V_6P|WPEXLg(g8k)UZ*gLkb?>W9c*RZv%{b!SHH@!~=v_7#L@o>Ok ztyU=V;?$;Hn*n(Pym#uo)f#f-`KF1NZg~Q&yY7V6o%1yiCR7UO7NsbAW0rm7gBKm ziY9qvk)w3*7}p@95%k)SC%J%vih`20q+RT#hK!mWDlRaik&uPusBITa*kgx+JJBA=W4-fM%b)q16QL0L+#i=-zuH z|1-t*YG*}R(QPWPhaU{h@_iwo0SS2}_84+7yE~$GSX~(p6D6aN+21WV+}mkuedkm? z0SoL;azYk3KHR4Y`QR368Sv4;6lwHLm`+9yD#oyiC@N`2J+<^mf(Ev>wXMN#TrME0 Teg=Oy00000NkvXXu0mjfv2$7B diff --git a/Cydia.mm b/Cydia.mm index 4966a1bc..5b3eb805 100644 --- a/Cydia.mm +++ b/Cydia.mm @@ -1423,6 +1423,7 @@ typedef std::map< unsigned long, _H > SourceMap; /* Source Class {{{ */ @interface Source : NSObject { + CYString depiction_; CYString description_; CYString label_; CYString origin_; @@ -1445,6 +1446,7 @@ typedef std::map< unsigned long, _H > SourceMap; - (NSComparisonResult) compareByNameAndType:(Source *)source; +- (NSString *) depictionForPackage:(NSString *)package; - (NSString *) supportForPackage:(NSString *)package; - (NSDictionary *) record; @@ -1476,6 +1478,7 @@ typedef std::map< unsigned long, _H > SourceMap; description_.clear(); label_.clear(); origin_.clear(); + depiction_.clear(); support_.clear(); version_.clear(); defaultIcon_.clear(); @@ -1533,6 +1536,7 @@ typedef std::map< unsigned long, _H > SourceMap; CYString *value_; } names[] = { {"default-icon", &defaultIcon_}, + {"depiction", &depiction_}, {"description", &description_}, {"label", &label_}, {"origin", &origin_}, @@ -1587,6 +1591,10 @@ typedef std::map< unsigned long, _H > SourceMap; return [lhs compare:rhs options:LaxCompareOptions_]; } +- (NSString *) depictionForPackage:(NSString *)package { + return depiction_.empty() ? nil : [depiction_ stringByReplacingOccurrencesOfString:@"*" withString:package]; +} + - (NSString *) supportForPackage:(NSString *)package { return support_.empty() ? nil : [support_ stringByReplacingOccurrencesOfString:@"*" withString:package]; } @@ -2094,6 +2102,8 @@ struct PackageNameOrdering : _end } + visible_ = true; + _profile(Package$initWithVersion$Tags) pkgCache::TagIterator tag(iterator_.TagList()); if (!tag.end()) { @@ -2101,8 +2111,12 @@ struct PackageNameOrdering : do { const char *name(tag.Name()); [tags_ addObject:(NSString *)CFCString(name)]; - if (role_ == nil && strncmp(name, "role::", 6) == 0) + if (role_ == nil && strncmp(name, "role::", 6) == 0 && strcmp(name, "role::leaper") != 0) role_ = (NSString *) CFCString(name + 6); + if (visible_ && strncmp(name, "require::", 9) == 0 && ( + true + )) + visible_ = false; ++tag; } while (!tag.end()); } @@ -2162,7 +2176,7 @@ struct PackageNameOrdering : _end essential_ = ((iterator_->Flags & pkgCache::Flag::Essential) == 0 ? NO : YES) || [self hasTag:@"cydia::essential"]; - visible_ = [self hasSupportingRole] && [self unfiltered]; + visible_ &&= [self hasSupportingRole] && [self unfiltered]; } _end } return self; } @@ -2428,7 +2442,7 @@ struct PackageNameOrdering : } - (NSString *) depiction { - return depiction_; + return !depiction_.empty() ? depiction_ : [[self source] depictionForPackage:id_]; } - (Address *) sponsor { @@ -3331,6 +3345,8 @@ static NSArray *Finishes_; for (pkgAcquire::ItemIterator item = fetcher_->ItemsBegin(); item != fetcher_->ItemsEnd(); item++) { if ((*item)->Status == pkgAcquire::Item::StatDone && (*item)->Complete) continue; + if ((*item)->Status == pkgAcquire::Item::StatIdle) + continue; std::string uri = (*item)->DescURI(); std::string error = (*item)->ErrorText; @@ -3991,64 +4007,25 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [transition_ transition:6 toView:view_]; } -- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { - NSString *context([sheet context]); - - if ([context isEqualToString:@"error"]) - [sheet dismiss]; - else if ([context isEqualToString:@"conffile"]) { - FILE *input = [database_ input]; - - switch (button) { - case 1: - fprintf(input, "N\n"); - fflush(input); - break; - case 2: - fprintf(input, "Y\n"); - fflush(input); - break; - default: - _assert(false); - } - - [sheet dismiss]; - } -} - -- (void) closeButtonPushed { - running_ = NO; - - switch (Finish_) { - case 0: - [self resetView]; - break; - - case 1: - [delegate_ suspendWithAnimation:YES]; - break; +- (void) _checkError { + if (_error->PendingError()) { + std::string error; + if (!_error->PopMessage(error)) + _assert(false); - case 2: - system("launchctl stop com.apple.SpringBoard"); - break; + UIActionSheet *sheet = [[[UIActionSheet alloc] + initWithTitle:CYLocalize("ERROR") + buttons:[NSArray arrayWithObjects:CYLocalize("OKAY"), nil] + defaultButtonIndex:0 + delegate:self + context:@"_error" + ] autorelease]; - case 3: - system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_); - break; + [sheet setBodyText:[NSString stringWithUTF8String:error.c_str()]]; + [sheet popupAlertAnimated:YES]; - case 4: - system("reboot"); - break; + return; } -} - -- (void) _retachThread { - UINavigationItem *item = [navbar_ topItem]; - [item setTitle:CYLocalize("COMPLETE")]; - - [overlay_ addSubview:close_]; - [progress_ removeFromSuperview]; - [status_ removeFromSuperview]; [delegate_ progressViewIsComplete:self]; @@ -4137,6 +4114,71 @@ bool DepSubstrate(const pkgCache::VerIterator &iterator) { [delegate_ setStatusBarShowsProgress:NO]; } +- (void) alertSheet:(UIActionSheet *)sheet buttonClicked:(int)button { + NSString *context([sheet context]); + + if ([context isEqualToString:@"error"]) + [sheet dismiss]; + else if ([context isEqualToString:@"_error"]) { + [sheet dismiss]; + [self _checkError]; + } else if ([context isEqualToString:@"conffile"]) { + FILE *input = [database_ input]; + + switch (button) { + case 1: + fprintf(input, "N\n"); + fflush(input); + break; + case 2: + fprintf(input, "Y\n"); + fflush(input); + break; + default: + _assert(false); + } + + [sheet dismiss]; + } +} + +- (void) closeButtonPushed { + running_ = NO; + + switch (Finish_) { + case 0: + [self resetView]; + break; + + case 1: + [delegate_ suspendWithAnimation:YES]; + break; + + case 2: + system("launchctl stop com.apple.SpringBoard"); + break; + + case 3: + system("launchctl unload "SpringBoard_"; launchctl load "SpringBoard_); + break; + + case 4: + system("reboot"); + break; + } +} + +- (void) _retachThread { + UINavigationItem *item = [navbar_ topItem]; + [item setTitle:CYLocalize("COMPLETE")]; + + [overlay_ addSubview:close_]; + [progress_ removeFromSuperview]; + [status_ removeFromSuperview]; + + [self _checkError]; +} + - (void) _detachNewThreadData:(ProgressData *)data { _pooled [[data target] performSelector:[data selector] withObject:[data object]]; [data release]; diff --git a/Library/free.sh b/Library/free.sh index 703d3027..c38b2697 100755 --- a/Library/free.sh +++ b/Library/free.sh @@ -5,6 +5,7 @@ for dir in \ /Library/Wallpaper \ /Library/Ringtones \ /usr/include \ + /usr/lib/pam \ /usr/libexec \ /usr/share \ ; do diff --git a/Library/move.sh b/Library/move.sh index abfe2edf..4a15ca71 100755 --- a/Library/move.sh +++ b/Library/move.sh @@ -45,7 +45,7 @@ function shift_() { dir=${1%/} if [[ -d ${dir} && ! -h ${dir} ]]; then - used=$(du -bs "${dir}") + used=$(/usr/libexec/cydia/du -bs "${dir}") used=${used%%$'\t'*} free=$(df_ /var) diff --git a/UICaboodle/BrowserView.m b/UICaboodle/BrowserView.m index 10cc1937..fbec7b7c 100644 --- a/UICaboodle/BrowserView.m +++ b/UICaboodle/BrowserView.m @@ -240,7 +240,8 @@ _assert(dup2(fds[1], 1) != -1); _assert(close(fds[0]) != -1); _assert(close(fds[1]) != -1); - execlp("du", "du", "-s", [path UTF8String], NULL); + /* XXX: this should probably not use du */ + execl("/usr/libexec/cydia/du", "du", "-s", [path UTF8String], NULL); exit(1); _assert(false); } diff --git a/control b/control index 5843ad6e..a7ad6e2e 100644 --- a/control +++ b/control @@ -3,9 +3,9 @@ Priority: required Section: Packaging Maintainer: Jay Freeman (saurik) Architecture: iphoneos-arm -Version: 1.0.2847-1 +Version: 1.0.2881-1 Replaces: com.sosiphone.addcydia -Depends: apr, apt7, darwintools, pcre, shell-cmds, system-cmds +Depends: apr-lib, apt7-lib, darwintools, pcre, shell-cmds, system-cmds Pre-Depends: dpkg (>= 1.14.25-8) Conflicts: com.sosiphone.addcydia Description: graphical iPhone front-end for APT diff --git a/make.sh b/make.sh index f8edbe1a..0ed2d3e9 100755 --- a/make.sh +++ b/make.sh @@ -1,2 +1,2 @@ #!/bin/bash -/apl/tel/exec.sh :apr:apr-lib:apt7:pcre make package +/apl/tel/exec.sh :apr:apr-lib:apt7:apt7-lib:pcre make package -- 2.45.2