From 8b5bfd3cea63a4d6aa48c11d5d56139d18bba080 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 Dec 2021 23:13:31 +0100 Subject: [PATCH] Tidy up appimage code with f-strings and an appdir variable. --- cscript | 43 ++++++++++++++++++++++--------------------- 1 file changed, 22 insertions(+), 21 deletions(-) diff --git a/cscript b/cscript index 49a07fdb6..69feeae14 100644 --- a/cscript +++ b/cscript @@ -697,39 +697,40 @@ def package_rpm(target, cpu, version, options): def make_appimage(target, nice_name, internal_name, version): nice_filename = nice_name.replace(' ', '_') - os.makedirs('build/%s.AppDir/usr/bin' % nice_filename) - target.command('cp %s/bin/%s build/%s.AppDir/usr/bin' % (target.directory, internal_name, nice_filename)) - target.command('cp %s/src/openssl/apps/openssl build/%s.AppDir/usr/bin/dcpomatic2_openssl' % (target.directory, nice_filename)) - target.command('cp %s/bin/dcpverify build/%s.AppDir/usr/bin/dcpomatic2_verify' % (target.directory, nice_filename)) - target.command('mkdir -p build/%s.AppDir/usr/share/libdcp' % nice_filename) - target.command('cp -r %s/share/dcpomatic2 build/%s.AppDir/usr/share/' % (target.directory, nice_filename)) - target.command('cp -r %s/share/libdcp/xsd build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) - target.command('cp -r %s/share/libdcp/tags build/%s.AppDir/usr/share/libdcp/' % (target.directory, nice_filename)) + appdir = f'build/{nice_filename}.AppDir' + os.makedirs(f'{appdir}/usr/bin') + target.command(f'cp {target.directory}/bin/{internal_name} {appdir}/usr/bin') + target.command(f'cp {target.directory}/src/openssl/apps/openssl {appdir}/usr/bin/dcpomatic2_openssl') + target.command(f'cp {target.directory}/bin/dcpverify {appdir}/usr/bin/dcpomatic2_verify') + target.command(f'mkdir -p {appdir}/usr/share/libdcp') + target.command(f'cp -r {target.directory}/share/dcpomatic2 {appdir}/usr/share/') + target.command(f'cp -r {target.directory}/share/libdcp/xsd {appdir}/usr/share/libdcp/') + target.command(f'cp -r {target.directory}/share/libdcp/tags {appdir}/usr/share/libdcp/') lib = 'usr/lib/x86_64-linux-gnu' target.command(f'mkdir -p build/{nice_filename}.AppDir/{lib}/gdk-pixbuf-2.0/2.10.0') target.command(f'cp -a /{lib}/gdk-pixbuf-2.0 build/{nice_filename}.AppDir/usr/lib/x86_64-linux-gnu/') if internal_name == 'dcpomatic2_disk': - target.command('mkdir -p build/%s.AppDir/usr/share/polkit-1/actions' % nice_filename) - target.command('cp %s/share/polkit-1/actions/com.dcpomatic.write-drive.policy build/%s.AppDir/usr/share/polkit-1/actions' % (target.directory, nice_filename)) + target.command(f'mkdir -p {appdir}/usr/share/polkit-1/actions') + target.command(f'cp {target.directory}/share/polkit-1/actions/com.dcpomatic.write-drive.policy {appdir}/usr/share/polkit-1/actions') - with open('build/%s.AppDir/AppRun' % nice_filename, 'w') as f: + with open(f'{appdir}/AppRun', 'w') as f: print('#!/bin/bash', file=f) print('export PATH=$APPDIR/usr/bin:$PATH', file=f) print('export XDG_DATA_DIRS="$APPDIR/usr/share/:/usr/share/:$XDG_DATA_DIRS"', file=f) print('export LD_LIBRARY_PATH=$APPDIR/usr/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}', file=f) - print('"$APPDIR"/usr/bin/%s $@' % internal_name, file=f) - target.command('chmod a+rx build/%s.AppDir/AppRun' % nice_filename) - with open('build/%s.AppDir/%s.desktop' % (nice_filename, internal_name), 'w') as f: + print(f'"$APPDIR"/usr/bin/{internal_name} $@', file=f) + target.command(f'chmod a+rx {appdir}/AppRun') + with open(f'{appdir}/{internal_name}.desktop', 'w') as f: print('[Desktop Entry]', file=f) print('Type=Application', file=f) print('Categories=AudioVideo;', file=f) - print('Name=%s' % nice_name, file=f) - print('Icon=%s' % internal_name, file=f) - target.command('cp graphics/linux/256/%s.png build/%s.AppDir' % (internal_name, nice_filename)) - target.command('linuxdeploy-x86_64.AppImage --appdir build/%s.AppDir' % nice_filename) - target.command('appimagetool-x86_64.AppImage build/%s.AppDir' % nice_filename) - target.command('mv %s-x86_64.AppImage build/%s-%s-x86_64.AppImage' % (nice_filename, nice_filename, version)) - return os.path.abspath('build/%s-%s-x86_64.AppImage' % (nice_filename, version)) + print(f'Name={nice_name}', file=f) + print(f'Icon={internal_name}', file=f) + target.command(f'cp graphics/linux/256/{internal_name}.png {appdir}') + target.command(f'linuxdeploy-x86_64.AppImage --appdir {appdir}') + target.command(f'appimagetool-x86_64.AppImage {appdir}') + target.command(f'mv {nice_filename}-x86_64.AppImage build/{nice_filename}-{version}-x86_64.AppImage') + return os.path.abspath(f'build/{nice_filename}-{version}-x86_64.AppImage') def package(target, version, options): """version: DCP-o-matic version string""" -- 2.30.2