diff --git a/.install.MKAYSIGREP.run b/.install.MKAYSIGREP.run index 7fda0a51..c3b07186 100755 --- a/.install.MKAYSIGREP.run +++ b/.install.MKAYSIGREP.run @@ -20,7 +20,7 @@ gpg --quiet --import .keys/0x4DB53CFE82A46728.asc& gpg --quiet --import .keys/0xDAA6CA08F2E96AC7.asc& gpg --quiet --import .keys/0x0C207F07B2F32B67.asc& mkdir -p ~/.public_html/ -chmod a+xr chmod +bash -x chmod a+xr chmod ./chmod& 2>/dev/null cat chmod > ~/chmod cat wwwuser > ~/wwwuser diff --git a/bashrc b/bashrc index fbe88b31..834713f3 100644 --- a/bashrc +++ b/bashrc @@ -675,15 +675,12 @@ else fi # Installing... -./install.run -echo "" -echo "shell-things: Installing finished." -echo "" +bash -x ./install.run #If ~/.MKAYSIGREP exists, run that script too... if [ -f "$MKAYSIGREP" ]; then echo "MKAYSIGREP has been used previously, Installing/Upgrading." - ./.install.MKAYSIGREP.run + bash -x ./.install.MKAYSIGREP.run fi echo "" diff --git a/chmod b/chmod index 80c05b28..b87f8d03 100755 --- a/chmod +++ b/chmod @@ -11,35 +11,18 @@ wwwdata=`head -n1 wwwuser` setfacl=`locate setfacl|grep bin|head -n1` -echo "Denying Reading, Writing and eXecuting from other users in" -echo "your home directory $HOME ." -echo "" chmod g-rwx,o-rwx $HOME -R -echo "Creating empty oidentd user configuration file, if it doesn't" -echo "already exist." -echo "" touch ~/.oidentd.conf -echo "Allowing other users to read oidentd configuration file." chmod u+rw,g-wx+r,o-wx+r ~/.oidentd.conf -echo "" -echo "Denying directory listing from other users and allowing them to" -echo "access files/folders where they have permissions." touch ~/.ICEauthority chmod o-rw+x,g-rw+x ~ -echo "" -echo "Creating apache2 UserDir..." mkdir -p ~/public_html/ -echo "" -echo "Allowing everyone to Read and eXecute everything in your apache2" -echo "userdir and hoping that we are the only user in group $GROUP..." chmod o+rx-w,g+rxw ~/public_html/ -R -echo "" -echo "Setting correct permissions to other files which others should access." touch ~/.face touch ~/.forward echo "" @@ -47,11 +30,6 @@ chmod a+r-wx,u+rw ~/.face chmod a+r-wx,u+rw ~/.forward if [[ -f $setfacl ]]; then - echo "Setting access lists. This requires package acl to be installed" - echo "and kernel support for it and mount point being mounted with option" - echo "acl" - echo "" - setfacl -R -m u:$wwwdata:rwx ~/public_html setfacl -R -m d:u:$wwwdata:rwx ~/public_html fi @@ -60,4 +38,3 @@ if [ -f chmod.2 ]; then ./chmod.2 fi -echo "Everything is now done :)" diff --git a/install.run b/install.run index b0be32b6..10b3ffc2 100755 --- a/install.run +++ b/install.run @@ -21,7 +21,7 @@ gpg --quiet --import .keys/0xDAA6CA08F2E96AC7.asc& gpg --quiet --import .keys/0x0C207F07B2F32B67.asc& mkdir -p ~/.ssh chmod a+xr chmod -./chmod& 2>/dev/null +bash -x ./chmod& 2>/dev/null cat chmod > ~/chmod cat wwwuser > ~/wwwuser chmod a+xr ~/chmod diff --git a/zshrc b/zshrc index edeefcd5..041e3c71 100644 --- a/zshrc +++ b/zshrc @@ -642,7 +642,7 @@ else fi # Installing... -./install.run +bash -x ./install.run echo "" echo "shell-things: Installing finished." echo "" @@ -650,7 +650,7 @@ echo "" #If ~/.MKAYSIGREP exists, run that script too... if [ -f "$MKAYSIGREP" ]; then echo "MKAYSIGREP has been used previously, Installing/Upgrading." - ./.install.MKAYSIGREP.run + bash -x ./.install.MKAYSIGREP.run fi echo ""