From dd46bad23a7605f02cdf3de90a1b18d1452be791 Mon Sep 17 00:00:00 2001 From: Daniel Langbein Date: Sat, 26 Jun 2021 16:46:42 +0200 Subject: [PATCH] update README and other minorities --- .gitmodules | 3 +++ .idea/runConfigurations/build_all.xml | 17 +++++++++++++++++ .idea/vcs.xml | 1 + README.md | 23 +++++++++++++++++++---- build-pkg/build-all-without-docker.sh | 2 +- build-pkg/pkglist-AUR.txt | 2 +- 6 files changed, 42 insertions(+), 6 deletions(-) create mode 100644 .idea/runConfigurations/build_all.xml diff --git a/.gitmodules b/.gitmodules index c1f31f7..49f4726 100644 --- a/.gitmodules +++ b/.gitmodules @@ -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 diff --git a/.idea/runConfigurations/build_all.xml b/.idea/runConfigurations/build_all.xml new file mode 100644 index 0000000..5df324f --- /dev/null +++ b/.idea/runConfigurations/build_all.xml @@ -0,0 +1,17 @@ + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 08e2965..0af551e 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -17,6 +17,7 @@ + diff --git a/README.md b/README.md index a4e3084..c78fe62 100644 --- a/README.md +++ b/README.md @@ -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 ``` diff --git a/build-pkg/build-all-without-docker.sh b/build-pkg/build-all-without-docker.sh index c8ab35b..049a1aa 100755 --- a/build-pkg/build-all-without-docker.sh +++ b/build-pkg/build-all-without-docker.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "Please consider using ./build-all.sh instead. This script is outdated." diff --git a/build-pkg/pkglist-AUR.txt b/build-pkg/pkglist-AUR.txt index 9c229dd..10fe87a 100644 --- a/build-pkg/pkglist-AUR.txt +++ b/build-pkg/pkglist-AUR.txt @@ -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