From 45560950275335937b61af23406240ec3b23e275 Mon Sep 17 00:00:00 2001 From: Frede Hundewadt Date: Fri, 21 Feb 2020 12:56:31 +0100 Subject: [PATCH] small fixes --- airootfs/master.zip | 541 ++++++++++++++++++++++++++++++++++++ airootfs/pbif-master/update-pbif | 37 +++ airootfs/root/customize_airootfs.sh | 2 +- airootfs/update-pbif | 7 +- packages.x86_64 | 117 +++----- 5 files changed, 625 insertions(+), 79 deletions(-) create mode 100644 airootfs/master.zip create mode 100755 airootfs/pbif-master/update-pbif diff --git a/airootfs/master.zip b/airootfs/master.zip new file mode 100644 index 0000000..86ba1f0 --- /dev/null +++ b/airootfs/master.zip @@ -0,0 +1,541 @@ + + + + + + + + +pbif (git) - PacBang Linux - OSDN + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+
+
+
+ OSDN -- Develop and Download Open Source Software + +
+ +
+ + + + +
+
+
+ +
+
+ +
+ + +
+ + + + + +
+ + + + + + +
+
+ +
+ + +
+
+
+ +
+
+
+
+
+ +
+
    +
  • + R/O +
    • +
  • + HTTP +
    • +
  • + SSH +
    • +
  • + HTTPS +
    • +
+ +
Fork
+ +
+
+ +

+pbif:

+ + +
+
+

Snapshot Archive

+ + + + + + + + + +
Revisionmaster
Path/
+

+

Now generating repository archive. Please wait for a moment...

+ +
Show on old repository browser +
+ +
+
+ + + + +
+ + diff --git a/airootfs/pbif-master/update-pbif b/airootfs/pbif-master/update-pbif new file mode 100755 index 0000000..a44c995 --- /dev/null +++ b/airootfs/pbif-master/update-pbif @@ -0,0 +1,37 @@ +# !/bin/bash +# +# Update Pacbang Installer Script (version 1.0 - September 2015) +# +# Written by Carl Duff +# +# This script will automatically download the latest version of the installer +# from github. +# +# This program is free software, provided under the GNU General Public License +# as published by the Free Software Foundation. So feel free to copy, distribute, +# or modify it as you wish. +# + +VERSION="Update Pacbang Installer 1.0" +ANSWER="/tmp/.aif" + +# Check user is root, and that there is an active internet connection +# Seperated the checks into seperate "if" statements for readability. + + dialog --backtitle "$VERSION" --title " Pacbang Installation Update " --infobox "\nPlease wait... Even geduld aub... Bitte warten... Παρακαλώ περιμένετε... Attendere prego... Vennligst Vent... Proszę czekać... Подождите, пожалуйста... Por favor espera...\n" 0 0 + sleep 2 + + if [[ $(whoami) != "root" ]]; then + dialog --backtitle "$VERSION" --title " Error " --msgbox "\n- The installer must be run as root.\n- Je moet aangemeld zijn als ROOT.\n- Der Installer muss mit Superuser-Rechten gestartet werden.\n- Τον εγκαταστάτη πρέπει να εκτελούνται ως root.\n- L'installer deve essere eseguito come Root.\n- Installereren må kjøres som root.\n- Instalator musi być uruchomiony z konta administratora (root).\n- Установщик должен выполняться только администратором системы (пользователем root).\n- El instalador debe ejecutarse como root.\n" 0 0 + exit 1 + fi + + if [[ ! $(ping -c 1 google.com) ]]; then + dialog --backtitle "$VERSION" --title " Error " --msgbox "\n- Internet connection test failed.\n- Test internetverbinding mislukt.\n- Es konnte keine Verbindung zum Internet hergestellt werden.\n- οκιμή σύνδεσης στο Internet απέτυχε.\n- Il test della connessione ad Internet è fallito.\n- Internett tilkobling feilet.\n- Test połączenia z Internetem nie powiódł się.\n- Нет соединения с Интернетом.\n- Prueba de conexión a Internet fallida.\n" 0 0 + exit 1 + fi + + clear + wget -N https://github.com/fhdk/pbif/archive/master.zip + unzip -o master.zip -d / + /pbif-master/abif diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh index 8e253b9..902b985 100755 --- a/airootfs/root/customize_airootfs.sh +++ b/airootfs/root/customize_airootfs.sh @@ -33,7 +33,7 @@ cp -aT /etc/skel/ /root/ chmod 700 /root # add live user -useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /bin/bash paclive +useradd -m -p "" -g users -G "adm,audio,floppy,log,network,rfkill,scanner,storage,optical,power,wheel" -s /bin/zsh paclive chmod 750 /etc/sudoers.d chmod 440 /etc/sudoers.d/g_wheel diff --git a/airootfs/update-pbif b/airootfs/update-pbif index a44c995..dac25c7 100755 --- a/airootfs/update-pbif +++ b/airootfs/update-pbif @@ -26,12 +26,11 @@ ANSWER="/tmp/.aif" exit 1 fi - if [[ ! $(ping -c 1 google.com) ]]; then + if [[ ! $(ping -c 1 osdn.net) ]]; then dialog --backtitle "$VERSION" --title " Error " --msgbox "\n- Internet connection test failed.\n- Test internetverbinding mislukt.\n- Es konnte keine Verbindung zum Internet hergestellt werden.\n- οκιμή σύνδεσης στο Internet απέτυχε.\n- Il test della connessione ad Internet è fallito.\n- Internett tilkobling feilet.\n- Test połączenia z Internetem nie powiódł się.\n- Нет соединения с Интернетом.\n- Prueba de conexión a Internet fallida.\n" 0 0 exit 1 fi clear - wget -N https://github.com/fhdk/pbif/archive/master.zip - unzip -o master.zip -d / - /pbif-master/abif + git clone git.osdn.net:/gitroot/pacbang-linux/pbif.git pbif-master + /pbif-master/pbif diff --git a/packages.x86_64 b/packages.x86_64 index cef7ac9..fe200aa 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -1,90 +1,59 @@ -###################### -## Pacbang Specific ## -###################### - -##xorg packages -xorg-server -xorg-xinit -xorg-drivers - -##Sound alsa-utils - -##video drivers +archlinux-xdg-menu +bash-completion +conky +dmenu +firefox +git +gnome-icon-theme +gnome-keyring +gparted +gpicview-gtk3 +gtk-engine-murrine +gufw +gvfs +gvfs-nfs +gvfs-smb +htop +laptop-detect +lxappearance-gtk3 +lxdm-gtk3 +lxinput-gtk3 +lxrandr-gtk3 +lxterminal +mc mesa - -##networking networkmanager network-manager-applet +nitrogen +obconf +openbox openssh - -##system -python-xdg -virtualbox-guest-modules-arch -virtualbox-guest-utils -laptop-detect - -##permissions +p7zip +parcellite +pcmanfm-gtk3 polkit polkit-gnome -gnome-keyring -gufw - -##theme -gnome-icon-theme - -##fonts -ttf-dejavu - -##Mouse themes -xcursor-vanilla-dmz - -##environment -openbox +python-xdg tint2 -conky -nitrogen -xlockmore -volumeicon -archlinux-xdg-menu -parcellite - -## GUI configuration -obconf -lxappearance-gtk3 -lxrandr-gtk3 -lxinput-gtk3 - -##File Management -xdg-user-dirs -pcmanfm-gtk3 +ttf-dejavu udisks2 -gvfs -gvfs-afc -gvfs-smb - -##applications -gparted -lxterminal -firefox -xterm -dmenu -htop +unrar +unzip +virtualbox-guest-modules-arch +virtualbox-guest-utils +volumeicon wipe +xcursor-vanilla-dmz +xdg-user-dirs xed +xlockmore +xorg-drivers +xorg-server +xorg-xinit xreader -xviewer - -##DM -lxdm-gtk3 - -##archive -unzip +xterm zip -unrar - -##Other -bash-completion ###################### ## Arch base ## -- 2.11.0