diff --git a/.gitmodules b/.gitmodules index 3021f45..831fe86 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,352 +1,352 @@ [submodule "pkg/riseup-vpn"] path = pkg/riseup-vpn url = https://aur.archlinux.org/riseup-vpn.git - branch = master + update = merge [submodule "pkg/nordic-kde-git"] path = pkg/nordic-kde-git url = https://aur.archlinux.org/nordic-kde-git.git - branch = master + update = merge [submodule "pkg/qt-installer-framework"] path = pkg/qt-installer-framework url = https://aur.archlinux.org/qt-installer-framework.git - branch = master + update = merge [submodule "pkg/xournalpp-git"] path = pkg/xournalpp-git url = https://aur.archlinux.org/xournalpp-git.git - branch = master + update = merge [submodule "pkg/xorg-meta"] path = pkg/xorg-meta url = https://aur.archlinux.org/xorg-meta.git - branch = master + update = merge [submodule "pkg/adwaita-qt"] path = pkg/adwaita-qt url = https://aur.archlinux.org/adwaita-qt.git - branch = master + update = merge [submodule "pkg/adwaita-qt4"] path = pkg/adwaita-qt4 url = https://aur.archlinux.org/adwaita-qt4.git - branch = master + update = merge [submodule "pkg/aurutils"] path = pkg/aurutils url = https://aur.archlinux.org/aurutils.git - branch = master + update = merge [submodule "pkg/balena-etcher"] path = pkg/balena-etcher url = https://aur.archlinux.org/balena-etcher.git - branch = master + update = merge [submodule "pkg/calindori-git"] path = pkg/calindori-git url = https://aur.archlinux.org/calindori-git.git - branch = master + update = merge [submodule "pkg/chili-sddm-theme"] path = pkg/chili-sddm-theme url = https://aur.archlinux.org/chili-sddm-theme.git - branch = master + update = merge [submodule "pkg/chromaprint-fftw"] path = pkg/chromaprint-fftw url = https://aur.archlinux.org/chromaprint-fftw.git - branch = master + update = merge [submodule "pkg/crema"] path = pkg/crema url = https://aur.archlinux.org/crema.git - branch = master + update = merge [submodule "pkg/davs2"] path = pkg/davs2 url = https://aur.archlinux.org/davs2.git - branch = master + update = merge [submodule "pkg/decklink-sdk"] path = pkg/decklink-sdk url = https://aur.archlinux.org/decklink-sdk.git - branch = master + update = merge [submodule "pkg/discord_arch_electron"] path = pkg/discord_arch_electron url = https://aur.archlinux.org/discord_arch_electron.git - branch = master + update = merge [submodule "pkg/fedora-firefox-wayland-bin"] path = pkg/fedora-firefox-wayland-bin url = https://aur.archlinux.org/fedora-firefox-wayland-bin.git - branch = master + update = merge [submodule "pkg/ffmpeg-amd-full"] path = pkg/ffmpeg-amd-full url = https://aur.archlinux.org/ffmpeg-amd-full.git - branch = master + update = merge [submodule "pkg/firefox-profile-switcher-connector"] path = pkg/firefox-profile-switcher-connector url = https://aur.archlinux.org/firefox-profile-switcher-connector.git - branch = master + update = merge [submodule "pkg/flite1-patched"] path = pkg/flite1-patched url = https://aur.archlinux.org/flite1-patched.git - branch = master + update = merge [submodule "pkg/handbrake-full"] path = pkg/handbrake-full url = https://aur.archlinux.org/handbrake-full.git - branch = master + update = merge [submodule "pkg/holo"] path = pkg/holo url = https://aur.archlinux.org/holo.git - branch = master + update = merge [submodule "pkg/intellij-idea-ultimate-edition"] path = pkg/intellij-idea-ultimate-edition url = https://aur.archlinux.org/intellij-idea-ultimate-edition.git - branch = master + update = merge [submodule "pkg/jellyfin"] path = pkg/jellyfin url = https://aur.archlinux.org/jellyfin.git - branch = master + update = merge [submodule "pkg/jellyfin-bin"] path = pkg/jellyfin-bin url = https://aur.archlinux.org/jellyfin-bin.git - branch = master + update = merge [submodule "pkg/jellyfin-server-bin"] path = pkg/jellyfin-server-bin url = https://aur.archlinux.org/jellyfin-server-bin.git - branch = master + update = merge [submodule "pkg/jellyfin-web-bin"] path = pkg/jellyfin-web-bin url = https://aur.archlinux.org/jellyfin-web-bin.git - branch = master + update = merge [submodule "pkg/kclock"] path = pkg/kclock url = https://aur.archlinux.org/kclock.git - branch = master + update = merge [submodule "pkg/kirigami-addons-git"] path = pkg/kirigami-addons-git url = https://aur.archlinux.org/kirigami-addons-git.git - branch = master + update = merge [submodule "pkg/lensfun-git"] path = pkg/lensfun-git url = https://aur.archlinux.org/lensfun-git.git - branch = master + update = merge [submodule "pkg/libklvanc-git"] path = pkg/libklvanc-git url = https://aur.archlinux.org/libklvanc-git.git - branch = master + update = merge [submodule "pkg/libopenmpt-svn"] path = pkg/libopenmpt-svn url = https://aur.archlinux.org/libopenmpt-svn.git - branch = master + update = merge [submodule "pkg/librist"] path = pkg/librist url = https://aur.archlinux.org/librist.git - branch = master + update = merge [submodule "pkg/libwacom-surface"] path = pkg/libwacom-surface url = https://aur.archlinux.org/libwacom-surface.git - branch = master + update = merge [submodule "pkg/mauikit-git"] path = pkg/mauikit-git url = https://aur.archlinux.org/mauikit-git.git - branch = master + update = merge [submodule "pkg/meta-group-base-devel"] path = pkg/meta-group-base-devel url = https://aur.archlinux.org/meta-group-base-devel.git - branch = master + update = merge [submodule "pkg/mkcue"] path = pkg/mkcue url = https://aur.archlinux.org/mkcue.git - branch = master + update = merge [submodule "pkg/mugshot"] path = pkg/mugshot url = https://aur.archlinux.org/mugshot.git - branch = master + update = merge [submodule "pkg/ncurses5-compat-libs"] path = pkg/ncurses5-compat-libs url = https://aur.archlinux.org/ncurses5-compat-libs.git - branch = master + update = merge [submodule "pkg/nextcloud-client-git"] path = pkg/nextcloud-client-git url = https://aur.archlinux.org/nextcloud-client-git.git - branch = master + update = merge [submodule "pkg/opencl-amd"] path = pkg/opencl-amd url = https://aur.archlinux.org/opencl-amd.git - branch = master + update = merge [submodule "pkg/openh264"] path = pkg/openh264 url = https://aur.archlinux.org/openh264.git - branch = master + update = merge [submodule "pkg/pocketsphinx"] path = pkg/pocketsphinx url = https://aur.archlinux.org/pocketsphinx.git - branch = master + update = merge [submodule "pkg/portfolio-file-manager"] path = pkg/portfolio-file-manager url = https://aur.archlinux.org/portfolio-file-manager.git - branch = master + update = merge [submodule "pkg/pycharm-professional"] path = pkg/pycharm-professional url = https://aur.archlinux.org/pycharm-professional.git - branch = master + update = merge [submodule "pkg/pyspread"] path = pkg/pyspread url = https://aur.archlinux.org/pyspread.git - branch = master + update = merge [submodule "pkg/qt4"] path = pkg/qt4 url = https://aur.archlinux.org/qt4.git - branch = master + update = merge [submodule "pkg/sddm-theme-deepin-git"] path = pkg/sddm-theme-deepin-git url = https://aur.archlinux.org/sddm-theme-deepin-git.git - branch = master + update = merge [submodule "pkg/shine"] path = pkg/shine url = https://aur.archlinux.org/shine.git - branch = master + update = merge [submodule "pkg/signal-desktop-beta-bin"] path = pkg/signal-desktop-beta-bin url = https://aur.archlinux.org/signal-desktop-beta-bin.git - branch = master + update = merge [submodule "pkg/softmaker-office-2021-bin"] path = pkg/softmaker-office-2021-bin url = https://aur.archlinux.org/softmaker-office-2021-bin.git - branch = master + update = merge [submodule "pkg/sphinxbase"] path = pkg/sphinxbase url = https://aur.archlinux.org/sphinxbase.git - branch = master + update = merge [submodule "pkg/tagspaces-bin"] path = pkg/tagspaces-bin url = https://aur.archlinux.org/tagspaces-bin.git - branch = master + update = merge [submodule "pkg/timeshift"] path = pkg/timeshift url = https://aur.archlinux.org/timeshift.git - branch = master + update = merge [submodule "pkg/ttf-material-design-icons-git"] path = pkg/ttf-material-design-icons-git url = https://aur.archlinux.org/ttf-material-design-icons-git.git - branch = master + update = merge [submodule "pkg/ttf-unifont"] path = pkg/ttf-unifont url = https://aur.archlinux.org/ttf-unifont.git - branch = master + update = merge [submodule "pkg/uavs3d"] path = pkg/uavs3d url = https://aur.archlinux.org/uavs3d.git - branch = master + update = merge [submodule "pkg/umldesigner"] path = pkg/umldesigner url = https://aur.archlinux.org/umldesigner.git - branch = master + update = merge [submodule "pkg/vo-amrwbenc"] path = pkg/vo-amrwbenc url = https://aur.archlinux.org/vo-amrwbenc.git - branch = master + update = merge [submodule "pkg/vobcopy"] path = pkg/vobcopy url = https://aur.archlinux.org/vobcopy.git - branch = master + update = merge [submodule "pkg/wkhtmltopdf-static"] path = pkg/wkhtmltopdf-static url = https://aur.archlinux.org/wkhtmltopdf-static.git - branch = master + update = merge [submodule "pkg/wps-office"] path = pkg/wps-office url = https://aur.archlinux.org/wps-office.git - branch = master + update = merge [submodule "pkg/x264-git"] path = pkg/x264-git url = https://aur.archlinux.org/x264-git.git - branch = master + update = merge [submodule "pkg/xavs"] path = pkg/xavs url = https://aur.archlinux.org/xavs.git - branch = master + update = merge [submodule "pkg/xavs2"] path = pkg/xavs2 url = https://aur.archlinux.org/xavs2.git - branch = master + update = merge [submodule "pkg/xfce4-meta"] path = pkg/xfce4-meta url = https://aur.archlinux.org/xfce4-meta.git - branch = master + update = merge [submodule "pkg/xfce4-theme-switcher"] path = pkg/xfce4-theme-switcher url = https://aur.archlinux.org/xfce4-theme-switcher.git - branch = master + update = merge [submodule "pkg/yay"] path = pkg/yay url = https://aur.archlinux.org/yay.git - branch = master + update = merge [submodule "pkg/zotero"] path = pkg/zotero url = https://aur.archlinux.org/zotero.git - branch = master + update = merge [submodule "pkg/mozilla-common"] path = pkg/mozilla-common url = https://aur.archlinux.org/mozilla-common.git - branch = master + update = merge [submodule "pkg/youplay"] path = pkg/youplay url = https://aur.archlinux.org/youplay.git - branch = master + update = merge [submodule "pkg/python-mpv"] path = pkg/python-mpv url = https://aur.archlinux.org/python-mpv.git - branch = master + update = merge [submodule "pkg/vulkan-headers-git"] path = pkg/vulkan-headers-git url = https://aur.archlinux.org/vulkan-headers-git.git - branch = master + update = merge [submodule "pkg/uavs3d-git"] path = pkg/uavs3d-git url = https://aur.archlinux.org/uavs3d-git.git - branch = master + update = merge [submodule "pkg/iio-sensor-proxy-git"] path = pkg/iio-sensor-proxy-git url = https://aur.archlinux.org/iio-sensor-proxy-git.git - branch = master + update = merge [submodule "pkg/gnome-meta"] path = pkg/gnome-meta url = https://aur.archlinux.org/gnome-meta.git - branch = master + update = merge [submodule "pkg/gnome-shell-extension-appindicator-git"] path = pkg/gnome-shell-extension-appindicator-git url = https://aur.archlinux.org/gnome-shell-extension-appindicator-git.git - branch = master + update = merge [submodule "pkg/woeusb"] path = pkg/woeusb url = https://aur.archlinux.org/woeusb.git - branch = master + update = merge [submodule "pkg/zoom"] path = pkg/zoom url = https://aur.archlinux.org/zoom.git - branch = master + update = merge [submodule "pkg/zoom-firejail"] path = pkg/zoom-firejail url = https://aur.archlinux.org/zoom-firejail.git - branch = master + update = merge [submodule "pkg/riseup-vpn-terminal"] path = pkg/riseup-vpn-terminal url = https://aur.archlinux.org/riseup-vpn-terminal.git - branch = master + update = merge [submodule "pkg/forklift-git"] path = pkg/forklift-git url = https://aur.archlinux.org/forklift-git.git - branch = master + update = merge [submodule "pkg/toggle-bluetooth"] path = pkg/toggle-bluetooth url = https://aur.archlinux.org/toggle-bluetooth.git - branch = master + update = merge [submodule "pkg/amdgpu-pro-installer"] path = pkg/amdgpu-pro-installer url = https://aur.archlinux.org/amdgpu-pro-installer.git - branch = master + update = merge [submodule "pkg/mrwriter-git"] path = pkg/mrwriter-git url = https://aur.archlinux.org/mrwriter-git.git - branch = master + update = merge [submodule "pkg/jexiftoolgui"] path = pkg/jexiftoolgui url = https://aur.archlinux.org/jexiftoolgui.git - branch = master + update = merge [submodule "build-pkg/pkg/youtube-dlp"] path = pkg/youtube-dlp url = https://aur.archlinux.org/youtube-dlp.git - branch = master + update = merge [submodule "pkg/plib"] path = pkg/plib url = https://aur.archlinux.org/plib.git - branch = master + update = merge diff --git a/README.md b/README.md index c587407..075bb7e 100644 --- a/README.md +++ b/README.md @@ -57,6 +57,7 @@ They were added in the following manner: ```shell AUR_PKG=2048-qt git submodule add --branch master "https://aur.archlinux.org/${AUR_PKG}.git" pkg/"${AUR_PKG}" +git config -f .gitmodules submodule.pkg/"${AUR_PKG}".update merge # echo "Add ${AUR_PKG} to 'build-pkg/pkglist-AUR.txt'. Each line represents one build stage." ``` @@ -76,6 +77,13 @@ To update all submodules and add those who received an update to ```shell ./git-pull ``` + +In case your submodules are detached, run this: + +```shell +git submodule foreach 'git checkout master' +``` + ## Build outdated AUR packages The following command includes `./git-pull`. diff --git a/git-pull b/git-pull index f6995d7..dd2e72b 100755 --- a/git-pull +++ b/git-pull @@ -1,5 +1,4 @@ #!/bin/bash git pull || exit $? -# git submodule foreach 'git checkout master' git submodule foreach 'if git pull | grep '\''^Updating'\''; then printf " %s" "$(basename $sm_path)" >> $toplevel/build-pkg/pkglist.tmp; fi'