From 474c2f0af65738bf3870bb0caa77cdf7cb4c9c61 Mon Sep 17 00:00:00 2001
From: gwojda <gwojda@student.42.fr>
Date: Wed, 29 Mar 2017 11:09:27 +0200
Subject: [PATCH] norme ok, compilation ok, fichier auteur ok, nom binaire ok

---
 42sh/Makefile                 |  4 ++--
 42sh/auteur                   |  4 ++++
 42sh/libft/Makefile           |  5 ++---
 42sh/libft/update_makefile.sh | 17 -----------------
 42sh/src/hash_table/is_hash.c |  4 ++--
 42sh/update_makefile.sh       | 17 -----------------
 6 files changed, 10 insertions(+), 41 deletions(-)
 delete mode 100755 42sh/libft/update_makefile.sh
 delete mode 100755 42sh/update_makefile.sh

diff --git a/42sh/Makefile b/42sh/Makefile
index f3adc478..747725f3 100644
--- a/42sh/Makefile
+++ b/42sh/Makefile
@@ -6,11 +6,11 @@
 #    By: wescande <wescande@student.42.fr>          +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2016/08/29 21:32:58 by wescande          #+#    #+#              #
-#    Updated: 2017/03/29 11:03:41 by gwojda           ###   ########.fr        #
+#    Updated: 2017/03/29 11:09:04 by gwojda           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
-NAME		=	21sh
+NAME		=	42sh
 
 CC			=	gcc
 FLAGS		=	-Wall -Wextra -Werror
diff --git a/42sh/auteur b/42sh/auteur
index a68bfe60..e4cd2213 100644
--- a/42sh/auteur
+++ b/42sh/auteur
@@ -1 +1,5 @@
+alao
+jhalford
+ariard
+gwojda
 wescande
diff --git a/42sh/libft/Makefile b/42sh/libft/Makefile
index 344a1d97..097f38e0 100644
--- a/42sh/libft/Makefile
+++ b/42sh/libft/Makefile
@@ -6,7 +6,7 @@
 #    By: jhalford <jack@crans.org>                  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2017/02/07 16:09:36 by jhalford          #+#    #+#              #
-#    Updated: 2017/03/27 21:59:31 by gwojda           ###   ########.fr        #
+#    Updated: 2017/03/29 11:08:06 by gwojda           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -19,8 +19,7 @@ RM			=	/bin/rm -rf
 
 W_FLAGS		=	-Wall -Wextra -Werror -g
 D_FLAGS		=	-g
-V_FLAGS		=	#-fvisibility=hidden
-FLAGS		=	$(W_FLAGS) $(D_FLAGS) $(V_FLAGS)
+FLAGS		=	$(W_FLAGS) $(D_FLAGS)
 
 DELTA		=	$$(echo "$$(tput cols)-47"|bc)
 
diff --git a/42sh/libft/update_makefile.sh b/42sh/libft/update_makefile.sh
deleted file mode 100755
index a1b3228d..00000000
--- a/42sh/libft/update_makefile.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-MYPATH=$(pwd)
-CUR_MAKEFILE=$MYPATH/Makefile
-if [ -e $CUR_MAKEFILE ]
-then
-	echo "regenerate Makefile"
-	sed "`grep -n 'SRC_BASE	=' $CUR_MAKEFILE | sed 's/:.*//'`, \$d" $CUR_MAKEFILE > NEWMAKEFILE
-	grep 'SRC_BASE	=' $CUR_MAKEFILE >> NEWMAKEFILE
-	expr "$(find ./src | grep "\.c" | sed -e 's/src\///' -e 's/\.\///' -e 's/$/\\/')" : "\(.*\).$" >> NEWMAKEFILE
-	echo "" >> NEWMAKEFILE
-	grep 'SRCS		=' $CUR_MAKEFILE >> NEWMAKEFILE
-	sed "1, `grep -n 'SRCS		=' $CUR_MAKEFILE | sed 's/:.*//'`d" $CUR_MAKEFILE >> NEWMAKEFILE
-	mv $CUR_MAKEFILE ~/Documents/.OLDMakefile
-	mv NEWMAKEFILE $CUR_MAKEFILE
-	echo "Makefile done (copy still alive in ~/Documents/.OLDMakefile)"
-else
-	echo "Makefile not found."
-fi
diff --git a/42sh/src/hash_table/is_hash.c b/42sh/src/hash_table/is_hash.c
index f237795f..6c1dc818 100644
--- a/42sh/src/hash_table/is_hash.c
+++ b/42sh/src/hash_table/is_hash.c
@@ -6,7 +6,7 @@
 /*   By: gwojda <gwojda@student.42.fr>              +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/18 11:08:40 by gwojda            #+#    #+#             */
-/*   Updated: 2017/03/21 17:40:20 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/29 11:05:34 by gwojda           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -24,7 +24,7 @@ static char	*h_free_one(t_list **head, t_list *list, t_list *ref)
 	return (NULL);
 }
 
-char	*ft_is_hash(char *cmd)
+char		*ft_is_hash(char *cmd)
 {
 	t_list	*list;
 	t_list	*ref;
diff --git a/42sh/update_makefile.sh b/42sh/update_makefile.sh
deleted file mode 100755
index 0a4660f5..00000000
--- a/42sh/update_makefile.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-MYPATH=$(pwd)
-CUR_MAKEFILE=$MYPATH/Makefile
-if [ -e $CUR_MAKEFILE ]
-then
-	echo "regenerate Makefile"
-	sed "`grep -n 'SRC_BASE	=' $CUR_MAKEFILE | sed 's/:.*//'`, \$d" $CUR_MAKEFILE > NEWMAKEFILE
-	grep 'SRC_BASE	=' $CUR_MAKEFILE >> NEWMAKEFILE
-	expr "$(find ./src | grep "\.c$" | sed -e 's/src\///' -e 's/\.\///' -e 's/$/\\/')" : "\(.*\).$" >> NEWMAKEFILE
-	echo "" >> NEWMAKEFILE
-	grep 'SRCS		=' $CUR_MAKEFILE >> NEWMAKEFILE
-	sed "1, `grep -n 'SRCS		=' $CUR_MAKEFILE | sed 's/:.*//'`d" $CUR_MAKEFILE >> NEWMAKEFILE
-	mv $CUR_MAKEFILE ~/Documents/.OLDMakefile
-	mv NEWMAKEFILE $CUR_MAKEFILE
-	echo "Makefile done (copy still alive in ~/Documents/.OLDMakefile)"
-else
-	echo "Makefile not found."
-fi