Merge branch 'master' of ssh://192.168.115.233:222/SimplesIP/install_pabx

aplicativo-simplesip/app_install.sh

@@ -1,45 +1,41 @@
 #!/bin/bash
-trap "" 2 20
+#trap "" 2 20
 
 
 function arquivo_descriptografar(){
 
 	cd $path_arquivo
 
-	if [ ! -f "${TAR_HDAUX}.enc" && \
-	  	 ! -f "${TAR_VAR}.enc" && \
-	  	 ! -f "${TAR_ETC}.enc" && \
-	  	 ! -f "${TAR_USR}.enc" && \
-	  	 ! -f "${TAR_DATABASE}.enc" && \
-	] && echo "Falta arquivos criptografados" && sair_instalacao 40
+	if [[ ! -f "${TAR_HDAUX}.enc" && ! -f "${TAR_VAR}.enc" && ! -f "${TAR_ETC}.enc" || ! -f "${TAR_USR}.enc" || ! -f "${TAR_DATABASE}.enc" ]] 
+	then
+		echo "Falta arquivos criptografados" 
+	fi
 
-	openssl aes-256-cbc -d -pbkdf2 pass:\'$PASSWORD\' -in "${TAR_HDAUX}.enc" -out "${TAR_HDAUX}"
-	openssl aes-256-cbc -d -pbkdf2 pass:\'$PASSWORD\' -in "${TAR_VAR}.enc" -out "${TAR_VAR}"
-	openssl aes-256-cbc -d -pbkdf2 pass:\'$PASSWORD\' -in "${TAR_ETC}.enc" -out ${TAR_ETC}
-	openssl aes-256-cbc -d -pbkdf2 pass:\'$PASSWORD\' -in "${TAR_USR}.enc" -out "${TAR_USR}"
-	openssl aes-256-cbc -d -pbkdf2 pass:\'$PASSWORD\' -in "${TAR_DATABASE}.enc" -out "${TAR_DATABASE}"
+	openssl aes-256-cbc -d -pbkdf2 -pass pass:\'$PASSWORD_CRYPT\' -in "${TAR_HDAUX}.enc" -out "${TAR_HDAUX}"
+	openssl aes-256-cbc -d -pbkdf2 -pass pass:\'$PASSWORD_CRYPT\' -in "${TAR_VAR}.enc" -out "${TAR_VAR}"
+	openssl aes-256-cbc -d -pbkdf2 -pass pass:\'$PASSWORD_CRYPT\' -in "${TAR_ETC}.enc" -out ${TAR_ETC}
+	openssl aes-256-cbc -d -pbkdf2 -pass pass:\'$PASSWORD_CRYPT\' -in "${TAR_USR}.enc" -out "${TAR_USR}"
+	openssl aes-256-cbc -d -pbkdf2 -pass pass:\'$PASSWORD_CRYPT\' -in "${TAR_DATABASE}.enc" -out "${TAR_DATABASE}"
 
 }
 
 
 function descompactar(){
 
-	if [ ! -f "${TAR_HDAUX}" && \
-	  	 ! -f "${TAR_VAR}" && \
-	  	 ! -f "${TAR_ETC}" && \
-	  	 ! -f "${TAR_USR}" && \
-	  	 ! -f "${TAR_DATABASE}" && \
-	] && echo "Falta arquivos criptografados" && sair_instalacao 40
+	if [[ ! -f "${TAR_HDAUX}" || ! -f "${TAR_VAR}" || ! -f "${TAR_ETC}" || ! -f "${TAR_USR}" || ! -f "${TAR_DATABASE}" ]]
+	then	
+	 echo "Falta arquivos criptografados" && sair_instalacao 40
+	fi
 
-	tar -xf $TAR_HDAUX -C /
+	tar -xf $TAR_HDAUX
 	[ $? -ne 0 ] && sair_instalacao "não"
-	tar -xf ${TAR_VAR} -C /
+	tar -xf ${TAR_VAR}
 	[ $? -ne 0 ] && sair_instalacao "não" 
-	tar -xf ${TAR_ETC} -C /
+	tar -xf ${TAR_ETC}
 	[ $? -ne 0 ] && sair_instalacao "não" 
-	tar -xf ${TAR_USR} -C /
+	tar -xf ${TAR_USR}
 	[ $? -ne 0 ] && sair_instalacao "não" 
-	tar -xf ${TAR_DATABASE} -C /
+	tar -xf ${TAR_DATABASE}
 	[ $? -ne 0 ] && sair_instalacao "não"
 
 }
@@ -92,7 +88,7 @@ function sair_instalacao(){
 
 	/bin/rm -rf /tmp/sip_install.pid
 	cd $path_arquivo
-	rm -rf "$(find $path_arquivo -maxdepth 1 -type d)"
+#	rm -rf "$(find $path_arquivo -maxdepth 1 -type d)"
 	exit $1
 }
 
@@ -486,11 +482,11 @@ function server_postgresql(){
 COMPANY="SIMPLES IP"
 
 # O script encrypt_app.sh irá definir esse campo
-PASSWORD_CRYPT=
+PASSWORD_CRYPT="123123"
 
 TAR_HDAUX="hdaux.tar.gz"
 TAR_VAR="var.tar.gz"
-TAR_ETC="etcc.tar.gz"
+TAR_ETC="etc.tar.gz"
 TAR_USR="usr.tar.gz"
 TAR_DATABASE="database.tar.gz"
 
@@ -574,6 +570,7 @@ else
 fi
 
 criar_directory_app
-mover_arquivos_criptografados
+arquivo_descriptografar
+descompactar