Add a bashrc with a PS1 to improve the flatpak shell

flathub-infra · Dec 13, 2023 · 68ac120 · 68ac120
1 parent e42aba9
commit 68ac120
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/bashrc b/bashrc
@@ -0,0 +1 @@
+PS1='[📦 \w]\$ '
diff --git a/meson.build b/meson.build
@@ -38,6 +38,7 @@ endforeach
 
 first_run_template = files(get_option('first_run_template'))
 sdk_update_template = files(get_option('sdk_update_template'))
+bashrc_filename = fs.name(get_option('bashrc'))
 first_run_filename = fs.name(get_option('first_run_template'))
 sdk_update_filename = fs.name(get_option('sdk_update_template'))
 
@@ -46,6 +47,7 @@ wrapper_data = configuration_data({
     'EDITOR_BINARY': editor_path,
     'EDITOR_ARGS': ' '.join(editor_args),
     'EDITOR_TITLE': get_option('editor_title'),
+    'BASHRC': join_paths(datadir, bashrc_filename),
     'FIRST_RUN_README': join_paths(datadir, first_run_filename),
     'SDK_UPDATE_README': join_paths(datadir, sdk_update_filename),
     'FLAGFILE_PREFIX': get_option('flagfile_prefix'),
@@ -67,6 +69,11 @@ configure_file(input: 'vscode.sh',
                install_dir: get_option('bindir'),
                install_mode: 'rwxr-xr-x')
 
+configure_file(input: 'bashrc',
+               output: bashrc_filename,
+               copy: true,
+               install_dir: datadir)
+
 configure_file(input: first_run_template,
                output: first_run_filename,
                configuration: readme_data,

diff --git a/meson_options.txt b/meson_options.txt
@@ -4,6 +4,7 @@ option('editor_title', type: 'string', value: 'Visual Studio Code')
 option('program_name', type: 'string', value: 'code')
 option('flatpak_id', type: 'string')
 option('sdk_version', type: 'string')
+option('bashrc', type: 'string', value: 'bashrc')
 option('first_run_template', type: 'string', value: 'first_run.txt')
 option('sdk_update_template', type: 'string', value: 'sdk_update.txt')
 option('flagfile_prefix', type: 'string', value: 'flatpak-vscode')

diff --git a/vscode.sh b/vscode.sh
@@ -140,6 +140,7 @@ if [ "${FLATPAK_ISOLATE_GEM}" -ne 0 ]; then
   fi
 fi
 
+export ENV="@BASHRC@"
 export FLATPAK_IDE_ENV=1
 
 if [ ! -f "${FIRST_RUN}" ]; then