update README and other minorities

This commit is contained in:
Daniel Langbein 2021-06-26 16:46:42 +02:00
parent 2e1a675773
commit dd46bad23a
6 changed files with 42 additions and 6 deletions

3
.gitmodules vendored
View File

@ -244,3 +244,6 @@
[submodule "pkg/riseup-vpn-terminal"]
path = pkg/riseup-vpn-terminal
url = https://aur.archlinux.org/riseup-vpn-terminal.git
[submodule "pkg/forklift-git"]
path = pkg/forklift-git
url = https://aur.archlinux.org/forklift-git.git

17
.idea/runConfigurations/build_all.xml generated Normal file
View File

@ -0,0 +1,17 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="build-all" type="ShConfigurationType">
<option name="SCRIPT_TEXT" value="" />
<option name="INDEPENDENT_SCRIPT_PATH" value="true" />
<option name="SCRIPT_PATH" value="$PROJECT_DIR$/build-pkg/build-all.sh" />
<option name="SCRIPT_OPTIONS" value="pkglist.tmp" />
<option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
<option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$/build-pkg" />
<option name="INDEPENDENT_INTERPRETER_PATH" value="true" />
<option name="INTERPRETER_PATH" value="/usr/bin/bash" />
<option name="INTERPRETER_OPTIONS" value="" />
<option name="EXECUTE_IN_TERMINAL" value="true" />
<option name="EXECUTE_SCRIPT_FILE" value="true" />
<envs />
<method v="2" />
</configuration>
</component>

1
.idea/vcs.xml generated
View File

@ -17,6 +17,7 @@
<mapping directory="$PROJECT_DIR$/pkg/ffmpeg-amd-full" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pkg/firefox-profile-switcher-connector" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pkg/flite1-patched" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pkg/forklift-git" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pkg/gnome-meta" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pkg/gnome-shell-extension-appindicator-git" vcs="Git" />
<mapping directory="$PROJECT_DIR$/pkg/handbrake-full" vcs="Git" />

View File

@ -24,11 +24,26 @@ git submodule init
To update all submodules, run
```shell
# If no local changes were done
(set -o pipefail; git submodule update --remote | { grep 'Submodule path' || echo 'Everything up to date.'; })
if stdout="$(git submodule update --remote)"; then
# We capture only the part after "pkg" until the next "'" using sed
# Source: https://unix.stackexchange.com/a/165590/315162
sed 's|^Submodule path '\''pkg/\([^'\'']*\).*|\1|' <<< "$stdout"
else
echo "Some error occurred! Maybe there are local changes in some of the submodules?
"
#echo "$stdout"
fi
```
# Otherwise
git submodule foreach 'git pull'
It may happen that some submodules have a detached HEAD (due to local changes, etc.)
and do not get updated with the above command. One can list those submodules as follows:
```shell
git submodule status | grep --invert-match '(heads/master)$'
# One could then reset them to master with e.g.
# git reset --hard
# git checkout master
```

View File

@ -1,4 +1,4 @@
#!/bin/bash
#!/usr/bin/env bash
echo "Please consider using ./build-all.sh instead. This script is outdated."

View File

@ -1,3 +1,3 @@
adwaita-qt aurutils balena-etcher calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin kirigami-addons-git lensfun-git libklvanc-git libopenmpt-svn librist libwacom-surface mauikit-git meta-group-base-devel mkcue mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nordic-kde-git opencl-amd openh264 portfolio-file-manager pycharm-professional pyspread python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-amdgpu-pro vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xorg-meta xournalpp-git yay zoom zotero
adwaita-qt aurutils balena-etcher calindori-git chili-sddm-theme chromaprint-fftw crema davs2 decklink-sdk discord_arch_electron firefox-profile-switcher-connector flite1-patched forklift-git gnome-meta gnome-shell-extension-appindicator-git handbrake-full holo iio-sensor-proxy-git intellij-idea-ultimate-edition jellyfin-bin kirigami-addons-git lensfun-git libklvanc-git libopenmpt-svn librist libwacom-surface mauikit-git meta-group-base-devel mkcue mozilla-common mugshot ncurses5-compat-libs nextcloud-client-git nordic-kde-git opencl-amd openh264 portfolio-file-manager pycharm-professional pyspread python-mpv qt4 qt-installer-framework sddm-theme-deepin-git shine signal-desktop-beta-bin softmaker-office-2021-bin sphinxbase tagspaces-bin timeshift ttf-material-design-icons-git ttf-unifont uavs3d uavs3d-git umldesigner vo-amrwbenc vobcopy vulkan-amdgpu-pro vulkan-headers-git wkhtmltopdf-static woeusb x264-git xavs xavs2 xfce4-meta xfce4-theme-switcher xorg-meta xournalpp-git yay zoom zotero
adwaita-qt4 fedora-firefox-wayland-bin kclock pocketsphinx riseup-vpn youplay zoom-firejail
ffmpeg-amd-full riseup-vpn-terminal