Commit 27cf94e5 authored by Eric Vidal's avatar Eric Vidal 💬
Browse files

remove yaourt dependencies and replace it by cower, add... 

remove yaourt dependencies and replace it by cower, add aur_{build,deps,get_pkgbuild,install,get_pkgver_pkgrel} functions, rename name of package list file,using group name for package name is now allowed, typo fix, fix minor bugsput global variable with cap letter
parent ad55c94d

PKGBUILD

+2 −2
Original line number Diff line number Diff line
@@ -8,9 +8,9 @@ pkgdesc=" Script for automatic installation" 
arch=(x86_64)

url="file:///var/lib/obarun/$pkgname/update_package/$pkgname"

license=('BEERWARE')

depends=('arch-install-scripts' 'mc' 'yaourt' 'git' 'pacman' 'obarun-libs')

depends=('arch-install-scripts' 'mc' 'git' 'pacman' 'cower' 'obarun-libs')

backup=('etc/obarun/install.conf')

install=

#install=

source=("$pkgname::git+file:///var/lib/obarun/$pkgname/update_package/$pkgname")

md5sums=('SKIP')

validpgpkeys=('6DD4217456569BA711566AC7F06E8FDE7B45DAAC') # Eric Vidal

install.conf

+22 −14
Original line number Diff line number Diff line 
# Configuration file for obarun-install package



##################

## Main variable

##################



# allow to update the script when it launched [yes|no]

update="yes"

UPDATE="yes"



# git source of obarun-install package 

git_addr="https://github.com/Obarun/obarun-install.git"

GIT_ADDR="https://github.com/Obarun/obarun-install.git"



# gpg directory used during the installation

gpg_dir="/var/lib/obarun/gnupg"

GPG_DIR="/var/lib/obarun/gnupg"



# editor used during the installation

editor="mcedit"

EDITOR="mcedit"



# valid mountpoint for installation

newroot="/mnt"

NEWROOT="/mnt"



# configuration files directory used for the installation

config_dir="openboxS6"

CONFIG_DIR="openboxS6"



# cache directory used during the installation

cache_dir="/var/cache/pacman/pkg"

CACHE_DIR="/var/cache/pacman/pkg"



#########################

## Customization variable

#########################



# define name of the host for the new installation 

hostname="obarun"

HOSTNAME="obarun"



# define the locale for the new installation

locale="en_US.UTF-8"

LOCALE="en_US.UTF-8"



# define the zone for the new installation e.g Europe 

zone="GMT"

ZONE="GMT"



# define the subzone for the new installation e.g. Londres 

subzone=""

SUBZONE=""



# define the keymap for the console for the new installation

keymap="us"

KEYMAP="us"



# define the keymap for the Desktop for the new installation

xkeymap="us"

XKEYMAP="us"



# define the name for a new user for the new installation

newuser="obarun"
 
NEWUSER="obarun"

install_functions

+588 −431

File changed.

Preview size limit exceeded, changes collapsed.

obarun-install.in

+21 −18
Original line number Diff line number Diff line 
#!/bin/bash

#!/usr/bin/bash

# This script is under license BEER-WARE

# "THE BEER-WARE LICENSE" (Revision 42):

# <eric@obarun.org> wrote this file.  As long as you retain this notice you
@@ -11,23 +11,26 @@ 
#  3) A valid mirror appears in /etc/pacman.d/mirrorlist

#



shopt -s extglob



##		Check is the functions file exits

sourcing(){

	

if [[ -f /usr/lib/obarun/common_functions ]]; then

	source /usr/lib/obarun/common_functions

else

	echo "==>> Missing file : common_functions"

	exit	

fi

	local list

	

if [[ -f /usr/lib/obarun/install_functions ]]; then

	source /usr/lib/obarun/install_functions

	for list in /usr/lib/obarun/{common_functions,install_functions} /etc/obarun/install.conf; do

		if [[ -f "${list}" ]]; then

			source "${list}"

		else

	echo "==>> Missing file : install_functions"

			echo_error " Missing file : ${list}"

			exit	

		fi

	done

	

	unset list

}

sourcing



shellopts_save

shellopts_set_unset "extglob" 0



##		Clean before exit
@@ -47,7 +50,7 @@ main_update(){ 
	reply_answer



	if (( ! $? )); then

		pac_update "obarun-install" "/var/lib/obarun/obarun-install" "$git_addr" || die " Impossible to update" "clean_install"

		pac_update "obarun-install" "/var/lib/obarun/obarun-install" "$GIT_ADDR" || die " Impossible to update" "clean_install"

		source /usr/lib/obarun/install_functions

	else

		echo_retry " Some functionalities will cannot working properly without updating"
@@ -56,7 +59,7 @@ main_update(){ 
	fi

}



if [[ "$update" == "yes" ]]; then

if [[ "$UPDATE" == "yes" ]]; then

	main_update

fi