diff options
author | Brett Cornwall | 2020-05-08 10:12:35 -0700 |
---|---|---|
committer | Brett Cornwall | 2020-05-08 10:12:55 -0700 |
commit | 00ccbcbf55086b781ad2501a27b16b3134c8b9d5 (patch) | |
tree | 091ab85580aa39ce416ef5c5d823cb14a9e2329b | |
parent | c8f955a26a68446413d501e230b45c52b6569590 (diff) | |
download | aur-00ccbcbf55086b781ad2501a27b16b3134c8b9d5.tar.gz |
upgpkg: 5.08; patch out update checks
Reformat xdg_config_dirs.patch to use four spaces now that GAM is
getting with the program on PEP8
-rw-r--r-- | .SRCINFO | 4 | ||||
-rw-r--r-- | PKGBUILD | 8 | ||||
-rw-r--r-- | disable_update_checks.patch | 11 | ||||
-rw-r--r-- | xdg_config_dirs.patch | 39 |
4 files changed, 33 insertions, 29 deletions
@@ -16,9 +16,11 @@ pkgbase = gam depends = python-passlib source = gam-5.08.tar.gz::https://github.com/jay0lee/GAM/archive/v5.08.tar.gz source = xdg_config_dirs.patch + source = disable_update_checks.patch source = gam.sh sha256sums = 7c347c9707e84a5d56bcbd9a548587f3a7122160099724f231ec4d8869456cde - sha256sums = 3e1dcfd32d3635143c220b07752c46af523b6a875b80f01108a43144669dec2a + sha256sums = bbb4bf158740c083d1209e6922b2b113b6fbdf0c8906aa706b2193b67041ed08 + sha256sums = 20ce5f7630feb47b1838ad998aa98bfafbc18f494f0697fbcfab484a572ae6d5 sha256sums = f8613546b8d4a51f05342d3680553c20a2e0995c3be90e469f1da3bb83ca172e pkgname = gam @@ -23,17 +23,20 @@ depends=( source=( "$pkgname-$pkgver.tar.gz::https://github.com/jay0lee/GAM/archive/v${pkgver}.tar.gz" "xdg_config_dirs.patch" + "disable_update_checks.patch" "gam.sh" ) sha256sums=('7c347c9707e84a5d56bcbd9a548587f3a7122160099724f231ec4d8869456cde' - '3e1dcfd32d3635143c220b07752c46af523b6a875b80f01108a43144669dec2a' + 'bbb4bf158740c083d1209e6922b2b113b6fbdf0c8906aa706b2193b67041ed08' + '20ce5f7630feb47b1838ad998aa98bfafbc18f494f0697fbcfab484a572ae6d5' 'f8613546b8d4a51f05342d3680553c20a2e0995c3be90e469f1da3bb83ca172e') prepare() { mv "GAM-$pkgver" "$pkgname-$pkgver" cd "$pkgname-$pkgver" patch -p0 < ../xdg_config_dirs.patch + patch -p0 < ../disable_update_checks.patch } package() { @@ -46,9 +49,6 @@ package() { cp -r "$pkgname-$pkgver"/src/gam/ "$pkgdir/usr/share/$pkgname" - # Upstream wants to insert themselves into every facet of where they should not be. - touch "$pkgdir/usr/share/$pkgname/gam/noupdatecheck.txt" - find "$pkgdir/usr/share/$pkgname" -type f -exec chmod 644 {} + find "$pkgdir/usr/share/$pkgname" -type d -exec chmod 755 {} + find "$pkgdir/usr/share/$pkgname" -name '*_test.py' -exec rm {} + diff --git a/disable_update_checks.patch b/disable_update_checks.patch new file mode 100644 index 000000000000..5579ea1539c2 --- /dev/null +++ b/disable_update_checks.patch @@ -0,0 +1,11 @@ +--- src/gam/var.py 2020-05-08 10:01:09.723815658 -0700 ++++ src/gam/var.py 2020-05-08 10:03:12.641007096 -0700 +@@ -1174,7 +1174,7 @@ + GC_DRIVE_DIR: '', + GC_NO_BROWSER: False, + GC_NO_CACHE: False, +- GC_NO_UPDATE_CHECK: False, ++ GC_NO_UPDATE_CHECK: True, + GC_NUM_THREADS: 25, + GC_OAUTH_BROWSER: False, + GC_OAUTH2_TXT: _FN_OAUTH2_TXT, diff --git a/xdg_config_dirs.patch b/xdg_config_dirs.patch index af914a841620..e26bd0e84cd7 100644 --- a/xdg_config_dirs.patch +++ b/xdg_config_dirs.patch @@ -1,26 +1,26 @@ ---- src/gam/var.py 2019-05-01 22:06:05.334383160 -0600 -+++ src/gam/var.py 2019-05-01 22:09:01.646756561 -0600 -@@ -20,6 +20,19 @@ - GAM_LATEST_RELEASE = GAM_ALL_RELEASES+'/latest' - GAM_PROJECT_APIS = 'https://raw.githubusercontent.com/jay0lee/GAM/master/src/project-apis.txt' +--- src/gam/var.py 2020-05-08 10:01:09.723815658 -0700 ++++ src/gam/var.py 2020-05-08 10:00:47.173712281 -0700 +@@ -21,6 +21,19 @@ + GAM_LATEST_RELEASE = GAM_ALL_RELEASES + '/latest' + GAM_PROJECT_FILEPATH = 'https://raw.githubusercontent.com/jay0lee/GAM/master/src/' +try: -+ XDG_CONFIG_DIR = os.environ['XDG_CONFIG_HOME'] ++ XDG_CONFIG_DIR = os.environ['XDG_CONFIG_HOME'] +except KeyError: -+ XDG_CONFIG_DIR = os.path.expanduser("~") + '/.config/' ++ XDG_CONFIG_DIR = os.path.expanduser("~") + '/.config/' +CONFIG_DIR = XDG_CONFIG_DIR + 'gam/' + +try: -+ os.makedirs(CONFIG_DIR, mode=700) ++ os.makedirs(CONFIG_DIR, mode=700) +except OSError: -+ if not os.path.isdir(CONFIG_DIR): -+ raise ++ if not os.path.isdir(CONFIG_DIR): ++ raise + + true_values = ['on', 'yes', 'enabled', 'true', '1'] false_values = ['off', 'no', 'disabled', 'false', '0'] - usergroup_types = ['user', 'users', -@@ -32,8 +45,8 @@ + usergroup_types = [ +@@ -35,8 +48,8 @@ WARNING_PREFIX = 'WARNING: ' UTF8 = 'utf-8' UTF8_SIG = 'utf-8-sig' @@ -31,7 +31,7 @@ MY_CUSTOMER = 'my_customer' # See https://support.google.com/drive/answer/37603 MAX_GOOGLE_SHEET_CELLS = 5000000 -@@ -640,9 +653,9 @@ +@@ -1065,9 +1078,9 @@ # _DEFAULT_CHARSET = UTF8 @@ -43,8 +43,8 @@ +_FN_OAUTH2_TXT = CONFIG_DIR + 'oauth2.txt' # GM_Globals = { - GM_SYSEXITRC: 0, -@@ -685,7 +698,7 @@ + GM_SYSEXITRC: 0, +@@ -1111,7 +1124,7 @@ # Path to client_secrets.json GC_CLIENT_SECRETS_JSON = 'client_secrets_json' # GAM config directory containing client_secrets.json, oauth2.txt, oauth2service.json, extra_args.txt @@ -53,12 +53,3 @@ # custmerId from gam.cfg or retrieved from Google GC_CUSTOMER_ID = 'customer_id' # If debug_level > 0: extra_args[u'prettyPrint'] = True, httplib2.debuglevel = gam_debug_level, appsObj.debug = True -@@ -752,7 +765,7 @@ - GC_MEMBER_MAX_RESULTS: 200, - GC_NO_BROWSER: False, - GC_NO_CACHE: False, -- GC_NO_UPDATE_CHECK: False, -+ GC_NO_UPDATE_CHECK: True, - GC_NUM_THREADS: 25, - GC_OAUTH2_TXT: _FN_OAUTH2_TXT, - GC_OAUTH2SERVICE_JSON: _FN_OAUTH2SERVICE_JSON, |